From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 五月 2025 09:45:07 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 8 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 173a079..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,6 +76,45 @@ @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 ; @@ -86,14 +125,13 @@ @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") + + @ApiModelProperty(value = "浼佷笟鍚嶇О" ) @TableField(exist = false) - private Solutions solution; + private String companyName ; + @ApiModelProperty(value = "绛剧讲浜哄悕绉�" ) + @TableField(exist = false) + private String signUserName ; + } -- Gitblit v1.9.3