Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of…

Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -216,7 +216,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     private GetActivityMsgHandle getActivityMsgHandle;
     @Autowired
     private GiftCacheManager giftCacheManager;
-    @Value("${ycs.partnerId:2690,2702,2664}")
+    @Value("${ycs.partnerId:2664}")
     private String ycsPartnerId;
     @Autowired
     private CustomerClient customerClient;