Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-01 816723558ad20dc16b08426df30504cda21873c1

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

@@ -97,7 +97,7 @@
     * 首页统计用
     * @return
     */
    int reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);
    String reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);


}