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

lidongdong

2022-11-01 593f9e3ae05a60ddb7f0abdea6077617000153d0

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