From b3585e6475b7a7ab38fcb8af79def5e938a297ea Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 18:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/pojo/response/GoodsModelVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..b863e12 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
@@ -18,7 +18,10 @@
private Integer counts;
private Integer worehouseCount;
private Long baseGoodsModelsId;
- private Long totalAmount;
+ private Integer totalAmount;
+
+
+ private String scrappedName;
}
--
Gitblit v1.9.1