From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
index d2e86dd..a16f7dd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,16 +12,17 @@
@ApiModel(value = "货架视图对象", description = "货架视图对象")
public class SlGoodsShelfVO {
@ApiModelProperty("数据id")
- private Integer id;
+ private Long id;
@ApiModelProperty("仓库id")
- private Integer storeManagementId;
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long storeManagementId;
@ApiModelProperty("仓库名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String storeManagementName;
@ApiModelProperty("货架名称")
- @TableField("goods_shelf_name")
private String goodsShelfName;
@ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
--
Gitblit v1.7.1