Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of…

Merge branches 'feature/20210831_购物车新算价校验加购数量限制_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

pom.xml

@@ -215,7 +215,6 @@
         </repository>
     </repositories>
 
-
     <build>
         <plugins>
             <!-- maven 打包时跳过测试 -->