Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-14 5b3f7effde361525994ca9928e599b88a646593b

 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);
    }