From 2b2e8603381d62b5da4a817710b33d583561ff3f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 12 九月 2025 09:27:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java index 36f0d1f..9c7e193 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java @@ -39,7 +39,7 @@ @ApiModelProperty(value = "是否退款 0否1时") private Integer isRefund; @ApiModelProperty(value = "备注") - private Integer remark; + private String remark; /** * 支付方式(1=微信,2=支付宝) @@ -67,5 +67,8 @@ @TableField("state") private Integer state; + @ApiModelProperty(value = "菜单显示 1显示 2不显示") + private Integer menuShow=2; + } -- Gitblit v1.7.1