From 320199007604960ff16641e797a37e313550255e Mon Sep 17 00:00:00 2001
From: jun <337942886@qq.com>
Date: Wed, 18 Aug 2021 14:23:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E6=89=A3?=
 =?UTF-8?q?=E5=87=8F=E5=92=8C=E5=85=B6=E4=BB=96=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=EF=BC=8C=E6=B7=BB=E5=8A=A0lock=5Fversion=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 56c453d..5a919b9 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -14,13 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 
@@ -236,6 +230,11 @@ public class WmsStockSn extends BaseBean {
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public Integer lockVersion;
 
+    @Version
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
+    @ApiParam(value = "乐观锁", defaultValue = "0")
+    public Integer lockVersion;
+
     @ApiParam("容器编号")
     @Column(name = "CT_NO")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

From e2682b8a98c30ab286758ec7f6ab946c23bf4401 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Sat, 21 Aug 2021 12:40:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?17114=2019081-=E8=BF=94=E5=B7=A5=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E6=98=BE=E7=A4=BA=E7=9A=84BYPASS=E9=A1=B9=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE-20210820?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
index 1059142..f6d19df 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
@@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -44,4 +40,8 @@ public class MesBypassMapping extends BaseBean implements Serializable {
     @Column(name = "CHECK_NAME")
     @ApiParam("检测项描述")
     private String checkName;
+
+    @Column(name = "IS_DISPLAY")
+    @ApiParam("是否显示")
+    private Integer isDisplay;
 }