Merge remote-tracking branch 'origin/SO1434' into SO1434

# Conflicts:
#	src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpUnclaimedController.java

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpBoxUtil.java

@@ -300,13 +300,13 @@ public class SpBoxUtil {
         //返回格口数量
         //返回格口数量
 
 
         if (boxStr.startsWith("CS")) {
         if (boxStr.startsWith("CS")) {
-            return 6;
-        } else if (boxStr.startsWith("CB")) {
+            return 8;
+        } else if (boxStr.startsWith("CM")) {
 
 
             return 4;
             return 4;
-        } else if (boxStr.startsWith("CM")) {
+        } else if (boxStr.startsWith("CB")) {
 
 
-            return 1;
+            return 2;
         }
         }
         return 0;
         return 0;
     }
     }