Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -24,7 +24,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
      */
 
     @ApiParam("工序")
-    private String processCode;
+    private List<String> processCodeList;
 
     //质量状态（20冻结，30报废）
     @ApiParam("质量状态")
@@ -40,7 +40,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
 
     //统计方式（0按月，1按天）
     @ApiParam("统计方式")
-    private Integer statisticalPlacer;
+    private Integer statisticalMethod;
 
     @ApiParam("开始时间")
     private String modifyStartDate;

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

@@ -41,12 +41,11 @@ public class ScrapOfPlatoModel {
     private BigDecimal scrapRatioPlato;
 
 
-    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
+    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
         this.partNo = partNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.defectCode = defectCode;
         this.defectName = defectName;
         this.numberOfDefects = numberOfDefects;
-        this.workCellCode = workCellCode;
     }
 }