Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-21 d25897a9e4a96079e3ef9d767083e631ead13a1c

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java

@@ -127,7 +127,7 @@
            return JsonResult.failMessage("请先下架商品！");
        }
        List<ScoreGoodsStyleDto> scoreGoodsStyles = model.getScoreGoodsStyles();
        if(CollUtil.isNotEmpty(scoreGoodsStyles)){
        if(CollUtil.isEmpty(scoreGoodsStyles)){
            return JsonResult.failMessage("样式不能为空！");
        }
        goodsService.updateGoods(model);