From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java | 4 ++--
1 files changed, 2 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..0cdb74d 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,7 @@
private String imgurl;
@ApiModelProperty(value = "鍗曚綅")
@ExcelColumn(name="鍗曚綅")
- private String unit;
+ private String unitName;
@ApiModelProperty(value = "绉垎鏈�澶氭姷鎵ｆ瘮渚�")
@ExcelColumn(name="绉垎鏈�澶氭姷鎵ｆ瘮渚�")
private BigDecimal integralRate;
@@ -86,7 +86,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