Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-24 baf2d29c0c8ec7329966a1af44ac9dd8f4b05e9c

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

}