Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 5ccc656f6ed10aaf14b662c3392b07e99b9016e0

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

@@ -65,10 +65,6 @@
        return baseMapper.updateGuid();
    }

    @Override
    public int countStatisticsNum(String state, String isTimeout) {
        return baseMapper.countStatisticsNum(state,isTimeout);
    }


}