Merge remote-tracking branch 'upstream/test' into test

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

@@ -27,6 +27,7 @@ public class CommonEnumUtil {
         SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
         QMS(5, 8260, 29, 128000000L, "i3qms", "质量管理软件"),
         TMS(101, 8250, 24, 118000000L, "i3tms", "运输管理系统"),
+        CDM(102, 8270, 30, 138000000L, "i3cdm", "报关管理系统"),
 
         /**
          * Mes 服务
@@ -69,7 +70,7 @@ public class CommonEnumUtil {
         APS_3(38, 18400, 26, 190000000L, "i3aps-3", "高级计划与排产-3"),
         APS_4(48, 8400, 27, 200000000L, "i3aps-4", "高级计划与排产-4"),
         SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
-        EAM(108, 8500, 28, 210000000L, "eam", "设备信息管理服务"),
+        EAM(108, 8550, 28, 210000000L, "eam", "设备信息管理服务"),
 
         /**
          * 基础服务

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java

@@ -53,4 +53,8 @@ public class MesPartFormula extends BaseBean implements Serializable {
     @ApiParam("配方类型")
     private Integer formulaType;
 
+    @Column(name = "REFER_QTY")
+    @ApiParam("参照数量")
+    private Integer referQty;
+
 }