From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
index fc06091..cae15a3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -54,15 +52,15 @@
@ApiModelProperty(value = "maintenanceOrderId")
private String maintenanceOrderId;
/**planStartTime*/
- @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "planStartTime")
private Date planStartTime;
/**planDelayTime*/
- @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "planDelayTime")
private Date planDelayTime;
/**planUser*/
@@ -99,4 +97,7 @@
@ApiModelProperty(value = "delFlag")
@TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ @TableField(exist = false)
+ private String planId;
+
}
--
Gitblit v1.9.3