From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java | 6 ++++++
1 files changed, 6 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 a54bac1..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
@@ -79,6 +79,12 @@
@Excel(name = "客户类型", width = 30, sort = 13)
private String goodsType;
+ @ApiModelProperty(value = "关联商户id")
+ @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