Merge branch 'score_shop' into api_score_meger

Helius

2021-11-12 a08db25b218d0d9a3a5120865854c2db685df2df

 zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java

@@ -122,8 +122,6 @@
//            shoppingGoodsCategory.setShopId(user.getShopId());
//        }
//        shoppingGoodsCategory.setCompanyId(user.getCompanyId());
        SysShopInfo zbShop = shopInfoDao.selectZbShop(getMe().getCompanyId());
        shoppingGoodsCategory.setShopId(zbShop.getId());
        QueryUtil.setQueryLimitCom(shoppingGoodsCategory);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, goodsCategoryService.findByModel(shoppingGoodsCategory), 0);
    }