From 8d41256df46a71c29bbe9cf8b25530b7691311c0 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 17:04:19 +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/Solutions.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index 4d6f9d5..ee6648f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -116,6 +116,7 @@
     @ApiModelProperty(value = "鎺ユ敹鏂囦欢閭")
     @ExcelColumn(name="鎺ユ敹鏂囦欢閭")
     private String email;
+
     @ApiModelProperty(value = "鎵垮寘鍏徃")
     @ExcelColumn(name="鎵垮寘鍏徃")
     private String companyName;
@@ -176,5 +177,8 @@
     @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О", example = "1")
     @TableField(exist = false)
     private String shopName;
+    @ApiModelProperty(value = "鏂规纭涔﹀璞�", example = "1")
+    @TableField(exist = false)
+    private Multifile fanganFile;
 
 }

--
Gitblit v1.9.3