Merge branch 'test' into ext-dev

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

@@ -44,4 +44,8 @@ public class MesBypassMapping extends BaseBean implements Serializable {
     @Column(name = "IS_DISPLAY")
     @ApiParam("是否显示")
     private Integer isDisplay;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
 }

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

@@ -32,6 +32,11 @@ import java.io.Serializable;
 @Api("关键件条码校验规则")
 public class MesKpsnRule extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2592621267902381297L;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;