From 637e8436a33cbc4ea04d4fc68763debaba8412c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 14:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 32e1cc8..1516e40 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -610,7 +610,6 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
- && this.cstateid.equals(orderDetl.getCstateid())
);
}
@@ -625,7 +624,6 @@
&& this.boxType1.equals(orderDetl.getBoxType1())
&& this.boxType2.equals(orderDetl.getBoxType2())
&& this.boxType3.equals(orderDetl.getBoxType3())
- && this.cstateid.equals(orderDetl.getCstateid())
);
}
--
Gitblit v1.9.1