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

yanghui

2022-10-21 f47934da3ee9cf9fe3c90140ec67854ef0e04590

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


}