Jenkins自动合并

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

@@ -95,7 +95,23 @@ public class WmsQCMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isPart;
 
+    @Transient
+    @ApiParam(value = "零件号")
+    public String partNo;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
+
+    public WmsQCMaster () {
+
+    }
+
+    public WmsQCMaster (String orderNo, String vendorNo, String refType, String refSrc, String partNo) {
+        this.orderNo = orderNo;
+        this.vendorNo = vendorNo;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.partNo = partNo;
+    }
 }