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

无关风月

3 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-account/src/main/java/com/dsh/account/vo/ConponJsonRuleModel.java

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

}