Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-11 912e143c73f70ddcf43840bec60c35a3af12c312

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -67,7 +67,9 @@
     */
    int countStatisticsNum(@Param("state") String state,
                           @Param("ids") List<String> ids,
                           @Param("time") String time);
                           @Param("time") String time,
                           @Param("isTimeout") String isTimeout,
                           @Param("evaluateState") String evaluateState);

    /**
     * 统计工单用