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

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

 cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java

@@ -19,7 +19,7 @@
    /**
     * 体验券名称
     */
    @ApiModelProperty("体验券名称 ")
    @ApiModelProperty("体验券名称/抵扣券商品名称 ")
    String experienceName;

}