Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-12 493aa6cef3d036702558bde1a6994dff705e12c1

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

@@ -58,4 +58,14 @@
    public int countNum() {
        return baseMapper.countNum();
    }

    @Override
    public int updateGuid() {
        return baseMapper.updateGuid();
    }

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