From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
index be3fb38..dca8aaf 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java
@@ -1,11 +1,12 @@
package com.consum.base.pojo.response;
+import java.util.List;
import lombok.Data;
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 鐗╁搧鍨嬪彿淇℃伅
* @date 2023/11/11 17:10
*/
@Data
@@ -18,7 +19,11 @@
private Integer counts;
private Integer worehouseCount;
private Long baseGoodsModelsId;
- private Long totalAmount;
+ private Integer totalAmount;
+ private String scrappedName;
+
+ private List<DepartGoodsUseInfo> useInfo;
+
}
--
Gitblit v1.9.1