Merge branch 'test' of https://gitee.com/jyyforjava/zq-erp into test

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java

@@ -115,7 +115,7 @@
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        List<SysShopInfo> shops=null;
        if(DataAuthUtil.hasAllShopAuth()){
            shops    = shopInfoDao.selectShopInfo(user.getCompanyId());
            shops= shopInfoDao.selectShopInfo(user.getCompanyId());
        }else{
            shops=Arrays.asList(shopInfoDao.selectById(user.getShopId()));
        }