From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java index c6b71f2..bf125e8 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java @@ -33,7 +33,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -42,7 +42,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -94,9 +94,10 @@ @ExcelColumn(name="鑱旂郴浜�") private String linkname; + @ApiModelProperty(value = "瀹℃牳鏃堕棿") @ExcelColumn(name="瀹℃牳鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date checkDate; @ApiModelProperty(value = "瀹℃牳澶囨敞") @@ -119,6 +120,12 @@ @ExcelColumn(name="鍩鸿〃缂栫爜锛堣嚜鍏宠仈锛�") private Integer baseId; + + + @ApiModelProperty(value = "鏂规涓婚敭") + @TableField(exist = false) + private Integer solutionId; + @ApiModelProperty(value = "娲鹃仯鍗曚綅鏂规绠″叧鑱斾俊鎭〃", example = "1") @TableField(exist = false) private List<DuSolution> duSolutionList; @@ -128,5 +135,15 @@ private List<DuLog> duLogList; + @ApiModelProperty(value = "娲鹃仯鍗曚綅鏂规绠″叧鑱斾富閿�") + @TableField(exist = false) + private Integer duSolutionId; + @ApiModelProperty(value = "浼佷笟鍚嶇О") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "娲鹃仯鍗曚綅涓嬬殑宸ョ淇℃伅") + @TableField(exist = false) + private List<Worktype> worktypeList; } -- Gitblit v1.9.3