Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-16 017020dd01104a8a39203962ece383ab1dc0dcdf

 zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java

@@ -36,6 +36,7 @@
        if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
            param.put("shopId",sysUsers.getShopId());
        }

        return AjaxResult.buildSuccessInstance(beauticianStateDao.selectItemDetail(param),
                beauticianStateDao.selectItemDetailTotal(param));
    }