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

Helius

2021-07-23 375237a59434d61567161131d85229d45c792366

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

@@ -171,7 +171,7 @@
        goodsCategoryModel.setCategoryIden(categoryIden);
        goodsCategoryModel.setParentId(parentId);
        List<QueryGoodsCategoryListVo> maps = scoreGoodsCategoryMapper.queryGoodsCategoryList(goodsCategoryModel);
        if(CollUtil.isNotEmpty(maps)){
        if(CollUtil.isNotEmpty(maps) && maps.size() > 1){
            return JsonResult.failMessage("分类不能重复添加！");
        }
        goodsCategoryModel.setId(id);