Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19908 -r19916
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19908)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19916)
@@ -5798,8 +5798,7 @@
 			
 			Long comboTousseId = comboTousseJson.optLong("id");
 			String comboTousseName = comboTousseJson.optString("tousseName");
-			TousseDefinition comboTousseTD = tousseDefinitionManager
-					.getForUpdate(comboTousseId);
+			TousseDefinition comboTousseTD = tousseDefinitionManager.getForUpdate(comboTousseId);
 			if (comboTousseTD == null) {
 				throw new RuntimeException(comboTousseName + "定义已不存在！");
 			}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/CustomIntoBasket.java
===================================================================
diff -u -r19889 -r19916
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/CustomIntoBasket.java	(.../CustomIntoBasket.java)	(revision 19889)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/CustomIntoBasket.java	(.../CustomIntoBasket.java)	(revision 19916)
@@ -5,6 +5,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.forgon.tools.MathTools;
 
@@ -33,7 +34,7 @@
 		this.barcode = barcode;
 	}
 	public String getWashClassifyType() {
-		return washClassifyType;
+		return StringUtils.defaultString(washClassifyType);
 	}
 	public void setWashClassifyType(String washClassifyType) {
 		this.washClassifyType = washClassifyType;