Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 15fa429882915d83cb91a2b4e971ebdb46e1cbb6

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

@@ -80,5 +80,9 @@
        return baseMapper.countId(district);
    }

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

}