Merge branch 'haucheng_panzhihua' into local_20221024

yanghui

2022-11-01 03dfa1de5279c75a4206f59226d871823bdbe72e

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

}