From 4e7a24ffb131b89948dce9f2380cc3b91db20b85 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:38 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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 312ff3f..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
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -20,7 +22,7 @@
@Data
@ApiModel("浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛�")
@TableName("`company_solution`")
-public class CompanySolution {
+public class CompanySolution implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -33,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +43,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,8 +65,8 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�", example = "1")
- @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�")
+ @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛� 鍩鸿〃鏁版嵁", example = "1")
+ @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛夊熀琛ㄦ暟鎹�")
private Integer solutionBaseId;
@ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1")
@@ -76,8 +76,62 @@
@ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
private Integer canReduce;
+ @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