Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

wzy

2021-11-28 c76890a550f386a52a7111e3d87242ab35af5b41

 zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java

@@ -37,7 +37,6 @@
        if(!DataAuthUtil.hasAllShopAuth()){
            shopInfo.setId(sysUsers.getShopId());
        }
        QueryUtil.setQueryLimitCom(sysUsers.getCompanyId());

        return AjaxResult.buildSuccessInstance(shopInfoService.findByModel(shopInfo));
    }