Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 fe8ffe15cba48fa5d8ab14d772b4c1fc276b47fd

 flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java

@@ -46,9 +46,5 @@
     * @return
     */
    int updateGuid();
    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(String state,String isTimeout);

}