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/SlGoodsMaterialsVO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsMaterialsVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsMaterialsVO.java
index d5d88d4..d6d1656 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsMaterialsVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsMaterialsVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
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;
@@ -9,14 +10,19 @@
@Data
@ApiModel(value = "物资视图对象", description = "物视图对象")
public class SlGoodsMaterialsVO {
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("物资名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsMaterialsName;
@ApiModelProperty("1 是非消耗，2是消耗 ")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isConsume;
@ApiModelProperty("预警库存")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer repertory;
+
+ @ApiModelProperty("物资缩写 ")
+ private String goodsMaterialsNo;
}
--
Gitblit v1.7.1