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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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

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

    Integer objType;
}