Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

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

@@ -81,8 +81,13 @@
    }

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

    @Override
    public int rangeStatistics(List<String> ids) {
        return baseMapper.rangeStatistics(ids);
    }

}