Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java

@@ -41,7 +41,7 @@ public class QcCheckTypeProject extends BaseEntity {
 	/** 抽样比例 */
 	@Excel(name = "抽样比例")
 	private BigDecimal sample;
-
+    private Integer sampleNum;
 	/** 是否启用,0是1否 */
 	@Excel(name = "是否启用,0是1否")
 	private String status;
@@ -65,6 +65,24 @@ public class QcCheckTypeProject extends BaseEntity {
 	@Excel(name = "物料编码")
 	private String materialCode;
 
+	private Integer sort;
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public Integer getSampleNum() {
+		return sampleNum;
+	}
+
+	public void setSampleNum(Integer sampleNum) {
+		this.sampleNum = sampleNum;
+	}
+
 	public void setId(String id) {
 		this.id = id;
 	}