Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -609,6 +609,9 @@ public class CalculationCommonService {
             case 310:
                 newType = 211;
                 break;
+            case 33:
+                newType = 32;
+                break;
         }
         return newType;
     }