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/nc/entity/NccJcRyWms.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/nc/entity/NccJcRyWms.java b/src/main/java/com/zy/nc/entity/NccJcRyWms.java
index 2646e66..dbe5e25 100644
--- a/src/main/java/com/zy/nc/entity/NccJcRyWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcRyWms.java
@@ -67,6 +67,15 @@
*/
private String sssyb;
+ /**
+ *
+ */
+ private Integer wmsFlag;
+ /**
+ *
+ */
+ private String wmsMemo;
+
@Override
public boolean equals(Object that) {
if (this == that) {
@@ -89,7 +98,8 @@
&& (this.getPkDept() == null ? other.getPkDept() == null : this.getPkDept().equals(other.getPkDept()))
&& (this.getSsbmbm() == null ? other.getSsbmbm() == null : this.getSsbmbm().equals(other.getSsbmbm()))
&& (this.getSsbmmc() == null ? other.getSsbmmc() == null : this.getSsbmmc().equals(other.getSsbmmc()))
- && (this.getSssyb() == null ? other.getSssyb() == null : this.getSssyb().equals(other.getSssyb()));
+ && (this.getSssyb() == null ? other.getSssyb() == null : this.getSssyb().equals(other.getSssyb()))
+ && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
}
@Override
@@ -107,6 +117,7 @@
result = prime * result + ((getSsbmbm() == null) ? 0 : getSsbmbm().hashCode());
result = prime * result + ((getSsbmmc() == null) ? 0 : getSsbmmc().hashCode());
result = prime * result + ((getSssyb() == null) ? 0 : getSssyb().hashCode());
+ result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
return result;
}
@@ -127,6 +138,7 @@
sb.append(", ssbmbm=").append(ssbmbm);
sb.append(", ssbmmc=").append(ssbmmc);
sb.append(", sssyb=").append(sssyb);
+ sb.append(", wmsFlag=").append(wmsFlag);
sb.append("]");
return sb.toString();
}
--
Gitblit v1.9.1