From e0656e2efef08e662eb4d33dafd601ce054597cf Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期五, 29 十二月 2023 15:01:17 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessCount.java | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessCount.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessCount.java index 9518a79..be5c923 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessCount.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcProcessCount.java @@ -12,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** * @author Lius @@ -49,24 +48,6 @@ @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "鏃ユ湡") private String theDate; - - /** - * 寮�濮嬫椂闂� - */ - @Excel(name = "寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "寮�濮嬫椂闂�") - private Date startTime; - - /** - * 缁撴潫鏃堕棿 - */ - @Excel(name = "缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "缁撴潫鏃堕棿") - private Date endTime; /** * 鏃堕暱 -- Gitblit v1.9.3