From 0b24c883b412fd1f096c5fe3fb607a3d9b13c97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 09:46:22 +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/BaseData.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
index 1e2cca7..5cf5b80 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseData.java
@@ -21,9 +21,9 @@
@TableName("`base_data`")
public class BaseData {
- @ApiModelProperty(value = "", example = "1")
+ @ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="")
- private Integer id;
+ private String id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
@@ -54,6 +54,12 @@
@ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelColumn(name="鍟嗗搧鍚嶇О")
private String name;
+ @ApiModelProperty(value = "搴撳瓨鎯呭喌")
+ @ExcelColumn(name="搴撳瓨鎯呭喌")
+ private String haveStock;
+ @ApiModelProperty(value = "搴撳瓨鎯呭喌")
+ @ExcelColumn(name="搴撳瓨鎯呭喌")
+ private String categoryImg;
@ApiModelProperty(value = "浜笢sku")
@ExcelColumn(name="浜笢sku")
--
Gitblit v1.9.3