From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 16 七月 2025 16:41:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java index 1d46ec2..7908533 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java @@ -83,6 +83,8 @@ @Excel(name = "关联商户名称", width = 30, sort = 14) private Long relationShopId; + private Integer bindingFlag; + @ApiModelProperty(value = "关联商户名称") @Excel(name = "关联商户名称", width = 30, sort = 14) private String relationShopName; -- Gitblit v1.7.1