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

无关风月

7 小时以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -67,5 +67,8 @@
    @TableField("state")
    private Integer state;

    @ApiModelProperty(value = "菜单显示 1显示 2不显示")
    private Integer menuShow=2;


}