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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -16,8 +16,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FORM_TABLE_TYPE {
-        TABLE(1, "table", "表"),
-        VIEW(2, "view", "视图");
+        TABLE(1, "TABLE", "表"),
+        VIEW(2, "VIEW", "视图");
 
         private int value;
         private String code;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java

@@ -11,10 +11,7 @@ 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.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean {
     private String propertyCode;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="虚拟属性名称")
+    @ApiParam(value ="显示名称")
     private String propertyName;
 
+    @Lob
+    @Column(name="PROPERTY_CODES")
+    @ApiParam(value ="属性代码")
+    private String propertyCodes;
+
     @Column(name="PROPERTY_TYPE")
     @ApiParam(value ="属性类型")
     private Integer propertyType;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java

@@ -45,9 +45,13 @@ public class WmsZones extends BaseBean {
     private String zoneName;
 
     @Column(name = "PARENT_ZONE_NO")
-    @ApiParam(value = "上层存储区")
+    @ApiParam(value = "父级存储区")
     private String parentZoneNo;
 
+    @Column(name = "IS_SON_NODE")
+    @ApiParam(value = "是否子节点")
+    private String isSonNode;
+
     @Column(name = "IS_PM")
     @ApiParam(value = "零件级管控" , example = "2")
     private Integer isPm;