Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -89,6 +89,8 @@ public enum ResponseResult {
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
     SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
+    SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
+
     /**
      * 订单状态码
      */