Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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;
 }

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;
 
@@ -251,6 +245,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)