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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CouponDataVo.java

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

    Integer objType;
    // 商品id
    Integer goodsId;
}