From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期四, 15 五月 2025 11:40:54 +0800 Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java index e477388..43ea498 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java @@ -174,6 +174,56 @@ @Excel(name = "褰撳墠宸ュ簭鍚嶇О") private String stdOp; + /** 宸ュ崟鍒涘缓鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date orderCreateTime; + + /** 宸ュ崟瀹℃牳鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date approveOn; + + /** 宸ュ崟寮�宸ユ椂闂� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date startWorkDate; + + /** 浣庨樁鐮�*/ + private String lowOrderCode; + + public Date getOrderCreateTime() { + return orderCreateTime; + } + + public void setOrderCreateTime(Date orderCreateTime) { + this.orderCreateTime = orderCreateTime; + } + + public Date getApproveOn() { + return approveOn; + } + + public void setApproveOn(Date approveOn) { + this.approveOn = approveOn; + } + + public Date getStartWorkDate() { + return startWorkDate; + } + + public void setStartWorkDate(Date startWorkDate) { + this.startWorkDate = startWorkDate; + } + + public String getLowOrderCode() { + return lowOrderCode; + } + + public void setLowOrderCode(String lowOrderCode) { + this.lowOrderCode = lowOrderCode; + } + public String getStdOp() { return stdOp; } -- Gitblit v1.9.3