Index: forgon-tools/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r34951 -r34964
--- forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 34951)
+++ forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 34964)
@@ -27,7 +27,7 @@
 			"4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44",
 			"4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62",
 			"4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79","4.9.80","4.9.81","4.9.82","4.9.83","4.9.84","4.9.85",
-			"4.9.86","4.9.87","4.9.88","4.9.89","4.9.90","4.9.91","4.9.92","4.9.93","4.9.94","4.9.95","4.9.96","4.9.97","4.9.98","4.9.99","5.0.0","5.0.1","5.0.2","5.0.3","5.0.4"};
+			"4.9.86","4.9.87","4.9.88","4.9.89","4.9.90","4.9.91","4.9.92","4.9.93","4.9.94","4.9.95","4.9.96","4.9.97","4.9.98","4.9.99","5.0.0","5.0.1","5.0.2","5.0.3"};
 
 	// 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本)
 	/*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r34951 -r34964
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 34951)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 34964)
@@ -1117,6 +1117,7 @@
 		return consumptiveMaterialVolume;
 	}
 	
+	@Column(columnDefinition=" varchar(255) default '" + Constants.STR_NO + "' not null ")
 	public String getBatchAndExpDateAllowBlank() {
 		return batchAndExpDateAllowBlank;
 	}
Fisheye: Tag 34964 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/5.0.3_5.0.4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?