Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 af0ce5be0e5e78bc2a4ffe962af636bc3d14b99e

 flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java

@@ -81,7 +81,7 @@
    }

    @Override
    public int reversionRate(String state, String isTimeout) {
    public String reversionRate(String state, String isTimeout) {
        return baseMapper.reversionRate(state,isTimeout);
    }