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

无关风月

1 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/model/SiteBookingQuery.java

@@ -16,5 +16,6 @@
    private BigDecimal amount;
    // 用户ids
    private List<Integer> userIds;

    // 门店ids
    private List<Integer> storeIds;
}