Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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

@@ -60,12 +60,12 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("数据查询类型")
     private Integer dataType = 1;
 
-    @Column(name = "LIMIT_TIMES")
+    @Column(name = "LIMIT_SPEL_EXPRESS")
-    @ApiParam("限定检测次数")
+    @ApiParam("限定检测表达式")
-    private Integer limitTimes;
+    private String limitSpelExpress;
 
     @Column(name = "RECORD_NUM_DESC")
-    @ApiParam("校验表达式描述")
+    @ApiParam("合格标准描述")
     private String recordNumDesc;
 
     @Transient

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

@@ -22,9 +22,6 @@ public class DataReviewModel {
     @ApiParam("实际数量")
     private String realNum;
 
-    @ApiParam("限定次数")
-    private String limitTimes;
-
     @ApiParam("检测次数")
     private String checkTimes;