935090232@qq.com
2021-10-15 7c4f93e72f2f0b4a9c5dd7c3ba35802357ec5e84
Merge branch 'score_shop' into api_score_meger
1 files modified
2 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java 2 ●●●●● patch | view | raw | blame | history
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);
    }