MARK FOR PULL

ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSampleDTO.java

@@ -32,4 +32,7 @@ public class InspectionSampleDTO implements Serializable {
     @ApiModelProperty(value = "取样时间")
     private LocalDateTime sampleTime;
 
+    @ApiModelProperty(value = "样本号")
+    private String sampleNumber;
+
 }

ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/InspectionSheetDTO.java

@@ -39,8 +39,8 @@ public class InspectionSheetDTO implements Serializable {
 	@ApiModelProperty(value = "产品名称，关联product表")
 	private String productName;
 
-	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
-	private String inspectionStage;
+	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验")
+	private Integer inspectionStage;
 
 	@ApiModelProperty(value = "工序id，关联working_procedure表")
 	private Long workingProcedureId;