Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-14 d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c

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

@@ -2,6 +2,7 @@


import com.dg.core.db.gen.entity.GuideEvolveEntity;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -45,5 +46,9 @@
     * @return
     */
    int updateGuid();

    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(String state,String isTimeout);
}