From 27c0c61e48bfb3e870d44b3b53a820568fcce5d5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 31 七月 2024 11:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
index 9a282c4..a33064b 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
@@ -51,7 +51,7 @@
/**
* 鎺掑簭
*/
- @NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
+ //@NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
public Integer nodeType;
/**
@@ -75,11 +75,11 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
@AssertTrue(message = "璇疯緭鍏ヨ褰曡澶囧懆鏈熷唴瀹�")
- public boolean isEquipCycleContentValid() {
- return !isRecord || (isRecord && StringUtils.isNotBlank(equipCycleContent));
+ public boolean isDeviceCycleContentValid() {
+ return !isRecord || (isRecord && StringUtils.isNotBlank(deviceCycleContent));
}
/**
--
Gitblit v1.8.0