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

无关风月

2025-09-01 c560f1a14ae1fc468d90e50e6a32d805295875da

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

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

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