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

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

@@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("任务单类型")
     private String checkOrderType;
 
+    @Column(name = "ON_SITE_FREQUENCY")
+    @ApiParam("巡检次数")
+    private Integer onSiteFrequency = 0;
+
     @Deprecated
     @ApiParam(value = "检测结果")
     @Transient

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

@@ -237,10 +237,10 @@ public class WmsStockSn extends BaseBean {
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public Integer lockVersion;
 
-    @ApiParam("托盘(容器)类型编号")
+    @ApiParam("容器编号")
-    @Column(name = "CT_CODE")
+    @Column(name = "CT_NO")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String ctCode;
+    private String ctNo;
 
     @ApiParam(value = "仓库名称")
     @Transient