From 511ce651667f5b2284247cc60599078b86f7963f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 23 一月 2026 13:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
index 34de15d..30d80eb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
@@ -71,7 +71,8 @@
private String imgurl;
@ApiModelProperty(value = "鍗曚綅")
@ExcelColumn(name="鍗曚綅")
- private String unit;
+ private String unitName;
+
@ApiModelProperty(value = "绉垎鏈�澶氭姷鎵ｆ瘮渚�")
@ExcelColumn(name="绉垎鏈�澶氭姷鎵ｆ瘮渚�")
private BigDecimal integralRate;
@@ -86,7 +87,7 @@
@ApiModelProperty(value = "搴撳瓨閲�", example = "1")
@ExcelColumn(name="搴撳瓨閲�")
- private Integer stock;
+ private BigDecimal stock;
@ApiModelProperty(value = "鍟嗗搧閲嶉噺(kg)", example = "1")
@ExcelColumn(name="鍟嗗搧閲嶉噺(kg)")
--
Gitblit v1.9.3