Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-10-27 7044df54b1809b1b09e8f20cdf9aef653f9ed12a

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


}