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

无关风月

9 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-activity/src/main/java/com/dsh/activity/model/request/CouponDataVo.java

@@ -98,4 +98,5 @@
    String storeIds;

    Integer objType;
    Integer goodsId;
}