Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -53,6 +53,14 @@ public class MesDefect extends BaseBean {
     @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
+    public MesDefect() {
 
+    }
 
+    public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) {
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectType = defectType;
+        this.defectTypeName = defectTypeName;
+    }
 }

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

@@ -29,7 +29,6 @@ import javax.persistence.Transient;
 @Api("包装规格")
 public class WmsPackageSpec extends BaseBean {
     private static final long serialVersionUID = 4849044986767609445L;
-    @Column(name = "SPEC_CODE",unique = true)
     @ApiParam(value = "包装规格代码")
     private String specCode;