Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 aa343eafae29f8171d22496ce876ead1d0f07bd0

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java

@@ -49,10 +49,6 @@
    int updateGuid();


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


}