From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index 55a59c9..28ae473 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -81,16 +79,17 @@
@ApiModelProperty(value = "鏂规鍚嶇О" )
@TableField(exist = false)
private String solutionName ;
-
-
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О" )
+ @TableField(exist = false)
+ private String shopName ;
@ApiModelProperty(value = "鏂规涓婚敭锛堝叧鑱攕olutions锛�", example = "1")
@ExcelColumn(name="鏂规涓婚敭锛堝叧鑱攕olutions锛�")
private Integer solutionId;
-
-
+ @ApiModelProperty(value = "鍟嗘埛涓婚敭锛堝叧鑱攃ompany锛�", example = "1")
+ @ExcelColumn(name="鍟嗘埛涓婚敭锛堝叧鑱攃ompany锛�")
+ private Integer shopId;
@ApiModelProperty(value = "鏂规瀵硅薄", example = "1")
@TableField(exist = false)
private Solutions solution;
-
}
--
Gitblit v1.9.3