From 54130a901757db72ae1d7c8d20cdfc2123749244 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 25 六月 2025 10:06:09 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 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 28ae473..fc8922c 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
@@ -76,20 +76,62 @@
@ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
private Integer canReduce;
- @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 = "鐘舵�� 0寰呯绔� 1宸茬绔�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呯绔� 1宸茬绔�")
+ private Integer signStatus;
+
+ @ApiModelProperty(value = "绛剧讲浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="绛剧讲浜哄憳缂栫爜")
+ private Integer signUserId;
+
+ @ApiModelProperty(value = "绛剧珷鏃堕棿", example = "1")
+ @ExcelColumn(name="绛剧珷鏃堕棿")
+ private Date signDate;
+
+
+ @ApiModelProperty(value = "绛剧珷澶囨敞", example = "1")
+ @ExcelColumn(name="绛剧珷澶囨敞")
+ private String signInfo;
+
+ @ApiModelProperty(value = "绛剧珷鍚庢枃浠跺湴鍧�", example = "1")
+ @ExcelColumn(name="绛剧珷鍚庢枃浠跺湴鍧�")
+ private String fileSignUrl;
+
+ @ApiModelProperty(value = "绛剧讲鍚堝悓鍙�", example = "1")
+ @ExcelColumn(name="绛剧讲鍚堝悓鍙�")
+ private String applyNo;
+
+ @ApiModelProperty(value = "绛剧讲鍓嶆枃浠跺湴鍧�", example = "1")
+ @ExcelColumn(name="绛剧讲鍓嶆枃浠跺湴鍧�")
+ private String fileUrl;
+
@ApiModelProperty(value = "鏂规瀵硅薄", example = "1")
@TableField(exist = false)
private Solutions solution;
+ @ApiModelProperty(value = "鏂规鍚嶇О" )
+ @TableField(exist = false)
+ private String solutionName ;
+
+ @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
+ @TableField(exist = false)
+ private Integer solutionType;
+ @ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О" )
+ @TableField(exist = false)
+ private String shopName ;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О" )
+ @TableField(exist = false)
+ private String companyName ;
+ @ApiModelProperty(value = "绛剧讲浜哄悕绉�" )
+ @TableField(exist = false)
+ private String signUserName ;
+
+
}
--
Gitblit v1.9.3