Merge branch 'test' into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java

@@ -5,9 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Transient;
-
 /**
  * @Description: 打印条码工步， 打印信息模板
  * @Reference:
@@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn {
     private String qcCode;
     @ApiParam("打印机名称")
     private String printerName;
+    @ApiParam("是否DB件")
+    private String isDb;
 }

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

@@ -158,10 +158,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("维修名称")
     private String repairName;
 
-    @Column(name = "SPEC_CODE")
-    @ApiParam("包装代码")
-    private String specCode;
-
     @Transient
     @ApiParam(value = "完成状态")
     public Integer orderStatus;