Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java

@@ -42,7 +42,7 @@ public class MCoffeeAddGoodsRequestVo {
      * 门店Id
      * 商城没有门店id，如果需要门店id必传在业务中进行校验
      */
-    //@NotEmpty(message = "shopId不能为空")
+//    @NotEmpty(message = "shopId不能为空")
     private String shopId;
 
     /**
@@ -55,6 +55,7 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String channelType;
 
+    @NotEmpty(message = "spuId不能为空")
     private String spuId;
 
     private String skuId;