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

lidongdong

2022-10-21 a6c7ae8b7578135f1be4ab58e8cc0d49c86529ec

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

}