Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 c240a87329a83a9bfe5b458014a68fcd0111133b

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