Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

@@ -39,7 +39,7 @@
    /**
     * 体验券名称
     */
    BigDecimal experience;
    String experience;
    /**
     * 说明
     */
@@ -83,7 +83,7 @@
    /**
     * 图片列表
     */
    List<String> goodImgs;
    String goodImgs;
    /**
     * 适用范围
     */
@@ -91,9 +91,11 @@
    /**
     * 城市code
     */
    List<Integer> cityIds;
    String cityIds;
    /**
     * 门店列表
     */
    List<Integer> storeIds;
    String storeIds;

    Integer objType;
}