From 687c9b21d0c8aedbd0c3f2d64b11cfaad5e38e85 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineMo.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 d031ba2..a41f824 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
@@ -46,10 +46,10 @@
@Schema(description = "鏂欏彿")
private String materialCode;
- /** 璁″垝瀹屽伐鏃ユ湡 */
+ /** 璁″垝瀹屽伐鏃� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屽伐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @Schema(description = "璁″垝瀹屽伐鏃ユ湡")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "璁″垝瀹屽伐鏃�")
private Date planEnd;
/** 鏁伴噺 */
--
Gitblit v1.9.3