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

无关风月

6 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -21,5 +21,7 @@
    private Integer isVip;
    @ApiModelProperty(value = "所有上架的会员卡")
    private List<Vip> vipList;
    @ApiModelProperty(value = "会员协议")
    private String agreement;

}