Index: forgon-tools/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r37500 -r37551
--- forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 37500)
+++ forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 37551)
@@ -28,7 +28,7 @@
 			"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","5.0.5","5.0.6","5.0.7",
-			"5.0.8","5.0.9","5.0.10","5.0.11","5.0.12","5.0.13","5.0.14","5.0.15","5.0.16","5.0.17","5.0.18","5.0.19","5.0.20"};
+			"5.0.8","5.0.9","5.0.10","5.0.11","5.0.12","5.0.13","5.0.14","5.0.15","5.0.16","5.0.17","5.0.18","5.0.19","5.0.20","5.0.21"};
 
 	// 版本列表(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-web/src/main/webapp/dataUpdater/sqls/5.0.20_5.0.21.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.20_5.0.21.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.20_5.0.21.sql	(revision 37551)
@@ -0,0 +1,4 @@
+update TousseInstance set returnGoodsItem_ID=(select max(returnGoodsItem_ID) from TousseInstance t where comboTousseInstanceId=TousseInstance.id)
+where returnGoodsItem_ID is null and exists (
+select 1 from TousseInstance t where t.comboTousseInstanceId=TousseInstance.id and t.returnGoodsItem_ID is not null
+);
\ No newline at end of file