From d801ee292fb95592b3ed0eaa95d3b2506c78c9c1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 17 三月 2022 09:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java | 14 ++++++++++++++
src/main/resources/mapper/QualityDetlMapper.xml | 1 +
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
index e4ade29..14dd164 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
@@ -153,6 +153,12 @@
private Integer quaStatus;
/**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
@@ -387,6 +393,14 @@
this.quaStatus = quaStatus;
}
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
public Long getModiUser() {
return modiUser;
}
diff --git a/src/main/resources/mapper/QualityDetlMapper.xml b/src/main/resources/mapper/QualityDetlMapper.xml
index 54044fc..cc0f12a 100644
--- a/src/main/resources/mapper/QualityDetlMapper.xml
+++ b/src/main/resources/mapper/QualityDetlMapper.xml
@@ -21,6 +21,7 @@
<result column="rejectQty" property="rejectQty" />
<result column="rejectReason" property="rejectReason" />
<result column="qua_status" property="quaStatus" />
+ <result column="memo" property="memo" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
--
Gitblit v1.9.1