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

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

@@ -162,4 +162,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("BOM用量")
     private Double bomQty = 0d;
+
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 }

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

@@ -159,6 +159,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("校验内容")
     private String checkContent;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }