Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-01 6cebcdd663ac06a6a8aa931058a515aa38a14bc3

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

}