From 9253517ff8a10e2df7924fdf6e0b737544d1a859 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 17:30:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
index aa85ddc..03feb35 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java
@@ -31,6 +31,17 @@
     @ApiModelProperty(hidden = true)
     private Long shopId;
 
+    @ApiModelProperty(hidden = true)
+    private Long companyId;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     public String getQueryKey() {
         return queryKey;
     }

--
Gitblit v1.9.1