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

lidongdong

2022-10-20 8cc5932b29d713088d8787c9e8a6b3dc0b87097a

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -260,8 +260,9 @@
     */
    @Override
    public int countStatisticsNum(String state, List<String> ids, String time,
                                  String isTimeout, String evaluateState, List<String> classifyIds) {
        return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds);
                                  String isTimeout, String evaluateState,
                                  List<String> classifyIds,String serviceState) {
        return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState);
    }

    @Override