Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-11 cef1ccae92f10d3a594f6c73ae4ddce1d52f5669

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

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

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