From a57390bfc4f92178e2adba3a2973ef6df0807656 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 23 五月 2025 15:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java | 59 ++---------------------------------------------------------
1 files changed, 2 insertions(+), 57 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java
index 2c83cd4..d031ba2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java
@@ -11,6 +11,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.Date;
/**
* 绠¤矾鎵嬪伐姘斾綋宸ュ崟鏁版嵁瀵硅薄 aps_gas_pipeline_mo
@@ -49,66 +50,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝瀹屽伐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "璁″垝瀹屽伐鏃ユ湡")
- private Timestamp planEnd;
+ private Date planEnd;
/** 鏁伴噺 */
@Excel(name = "鏁伴噺")
@Schema(description = "鏁伴噺")
private BigDecimal quantity;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setMo(String mo)
- {
- this.mo = mo;
- }
-
- public String getMo()
- {
- return mo;
- }
-
- public void setFactory(String factory)
- {
- this.factory = factory;
- }
-
- public String getFactory()
- {
- return factory;
- }
-
- public void setMaterialCode(String materialCode)
- {
- this.materialCode = materialCode;
- }
-
- public String getMaterialCode()
- {
- return materialCode;
- }
-
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("mo", getMo())
- .append("factory", getFactory())
- .append("materialCode", getMaterialCode())
- .append("planEnd", getPlanEnd())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
}
--
Gitblit v1.9.3