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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MoneyQueryRequest.java

@@ -15,5 +15,6 @@
    private List<String> cityList;

    private String type;
    private List<String> siteIds;

}