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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -39,7 +39,7 @@
    /**
     * 体验券名称
     */
    BigDecimal experience;
    String experience;
    /**
     * 说明
     */
@@ -96,4 +96,6 @@
     * 门店列表
     */
    String storeIds;

    Integer objType;
}