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/ManagementimgVolumeProductionRkVO.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
index 2be93c0..e798f34 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.management.domain.SlGoodsShelf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "通过入库管理拿入库物资的数据对象", description = "通过入库管理拿入库物资的数据对象")
@@ -27,15 +29,12 @@
private Integer storeManagementNumber;
@ApiModelProperty("入库数量")
- @TableField("rk_num")
- private Integer rkNum;
+ private Long rkNum;
@ApiModelProperty("入库型号")
- @TableField("rk_model")
private String rkModel;
@ApiModelProperty("入库价格")
- @TableField("rk_pice")
private BigDecimal rkPice;
@ApiModelProperty("供应商名称")
@@ -50,4 +49,18 @@
@ApiModelProperty("货架id")
private Long shelfId;
+ @ApiModelProperty("入库编号")
+ private String rkNumber;
+
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ @ApiModelProperty("")
+ private List<SlGoodsShelf> SlGoodsShelfs;
+
+ @ApiModelProperty("判断是不是新增的数据")
+ private String newAddTime;
+
+
+
}
--
Gitblit v1.7.1