From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
index 3a0374a..1f0baaf 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
@@ -1,5 +1,6 @@
 package com.matrix.system.app.vo;
 
+import com.matrix.system.hive.bean.SysVipLevel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,6 +14,9 @@
     @ApiModelProperty(value = "会员姓名")
     private String vipName;
 
+    @ApiModelProperty(value = "会员编号")
+    private String vipNo;
+
     @ApiModelProperty(value = "会员手机号")
     private String phone;
 
@@ -24,6 +28,12 @@
 
     @ApiModelProperty(value = "会员ID")
     private Long id;
+
+    @ApiModelProperty(value = "门店简称")
+    private String shopName;
+
+    @ApiModelProperty(value = "会员等级对象")
+    private String vipLevel;
 
     public String getVipName() {
         return vipName;
@@ -64,4 +74,28 @@
     public void setId(Long id) {
         this.id = id;
     }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getVipLevel() {
+        return vipLevel;
+    }
+
+    public void setVipLevel(String vipLevel) {
+        this.vipLevel = vipLevel;
+    }
+
+    public String getVipNo() {
+        return vipNo;
+    }
+
+    public void setVipNo(String vipNo) {
+        this.vipNo = vipNo;
+    }
 }

--
Gitblit v1.9.1