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

xiaoyong931011

2021-06-25 f04d604a7447fb42afee46d11b8e29c76ae5f02f

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

@@ -162,6 +162,9 @@
        if(!parentId.equals(scoreGoodsCategory.getParentId())){
            scoreGoodsCategory.setParentId(parentId);
        }
        if(parentId.equals(id)){
            return JsonResult.failMessage("父类不能为自己！");
        }

        GoodsCategoryModel goodsCategoryModel = new GoodsCategoryModel();
        goodsCategoryModel.setName(name);