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

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -96,4 +96,7 @@
     * 门店列表
     */
    String storeIds;

    Integer objType;
    Integer goodsId;
}