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

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

@@ -2351,7 +2351,8 @@ public class WmsEnumUtil {
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
-        INITIALIZE_SN("INITIALIZE_SN", "库存初始化");
+        INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
+        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
 
         private String code;
         private String description;
@@ -6376,7 +6377,12 @@ public class WmsEnumUtil {
         DATE_FORMAT(4, "Date", "日期格式"),
         FLOAT_FORMAT(5, "Float", "浮点格式"),
         BOOL_FORMAT(6, "Boolean", "布尔格式"),
-        LONG_FORMAT(7, "LONG", "长整数格式");
+        LONG_FORMAT(7, "LONG", "长整数格式"),
+        BYTE_FORMAT(8, "Byte", "字节格式"),
+        BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"),
+        BLOB_FORMAT(10, "Blob", "BLOB格式"),
+        CLOB_FORMAT(11, "Clob", "CLOB格式"),
+        TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式")
 
         private int value;
         private String code;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java

@@ -45,4 +45,7 @@ public class BasBeanFieldInfoModel implements Serializable {
 
     @ApiParam(value = "自增")
     private String isFieldGeneric;
+
+    @ApiParam(value = "数据表描述")
+    private String tableDesc;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java

@@ -34,4 +34,7 @@ public class BasBeanInfoModel implements Serializable {
 
     @ApiParam(value = "字段列表数据")
     private List<BasBeanFieldInfoModel> fieldInfoModelList;
+
+    @ApiParam(value = "表名列表数据")
+    private List<BasBeanInfoModel> basBeanInfoModelList;
 }