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

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java

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

@@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("大检测项类型")
-    public Integer checkTypeCode;
+    public String checkTypeCode;
 
     @Transient
     @ApiParam("样本数")

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

@@ -50,7 +50,7 @@ public class WmsTestResultDetails extends BaseBean {
 
     @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    public Integer checkTypeCode;
+    public String checkTypeCode;
 
     @Column(name = "QR_CODE")
     @ApiParam("二维码")
@@ -77,7 +77,7 @@ public class WmsTestResultDetails extends BaseBean {
     public WmsTestResultDetails() {
     }
 
-    public WmsTestResultDetails(String partNo, Integer checkTypeCode, String bhCode, Long checkSize) {
+    public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) {
         this.partNo = partNo;
         this.checkTypeCode = checkTypeCode;
         this.bhCode = bhCode;