Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

8 小时以前 8f37a2de432a8d4d77f94dcf45d0b86ce3006ee2

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

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

}