Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

 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));
    }