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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java

@@ -31,4 +31,5 @@
    private List<Integer> storeIds;
    // 运营商使用
    private List<TOperatorCity> operatorCities;

}