From b471c4d9a01438af23516b622eb4381c15a45073 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:51:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index 97ab626..ab188eb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
@@ -90,9 +90,12 @@
@ExcelColumn(name="鎸囧浠凤紙鍏冿級")
private BigDecimal zdPrice;
- @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
- @ExcelColumn(name="鍏ユ墜浠锋牸锛堝厓锛�")
+ @ApiModelProperty(value = "閿�鍞环鏍硷紙鍏冿級", example = "1")
+ @ExcelColumn(name="閿�鍞环鏍硷紙鍏冿級")
private BigDecimal price;
+ @ApiModelProperty(value = "鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�", example = "1")
+ @ExcelColumn(name="鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�")
+ private Integer origin;
@ApiModelProperty(value = "鍟嗗搧璇︽儏")
@ExcelColumn(name="鍟嗗搧璇︽儏")
@@ -122,5 +125,8 @@
@TableField(exist = false)
private List<Integer> idList;
-
+ @ApiModelProperty(value = "閲囪喘浠凤紙鍏冿級", example = "1")
+ @ExcelColumn(name="閲囪喘浠凤紙鍏冿級")
+ @TableField(exist = false)
+ private BigDecimal jdPrice;
}
--
Gitblit v1.9.3