Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java
===================================================================
diff -u -r16206 -r16974
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java	(.../PrintInvoiceConfig.java)	(revision 16206)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java	(.../PrintInvoiceConfig.java)	(revision 16974)
@@ -33,7 +33,7 @@
 	/**
 	 * 同科室的多张发货单是否合并打印。取消这个字段，使用合并打印方式字段。如果mergePrint为是,则为按科室打印。这一步由升级脚本处理
 	 */
-//	private String mergePrint;
+	private String mergePrint;
 	/**
 	 * 合并打印方式。按科室合并或者按申请单合并或者不合并。如果没设置值,由按科室合并
 	 */
@@ -84,14 +84,14 @@
 		this.id = id;
 	}
 
-//	public String getMergePrint() {
-//		return mergePrint;
-//	}
-//
-//	public void setMergePrint(String mergePrint) {
-//		this.mergePrint = mergePrint;
-//	}
+	public String getMergePrint() {
+		return mergePrint;
+	}
 
+	public void setMergePrint(String mergePrint) {
+		this.mergePrint = mergePrint;
+	}
+
 	public String getMergePrintType() {
 		return mergePrintType;
 	}