From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造

---
 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
index 92ecd5a..96781ab 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
@@ -9,6 +9,12 @@
 @Data
 public class PadVipCardDto extends BasePageDto {
 
+    @ApiModelProperty(value = "会员id", example = "1")
+    private Long  vipId;
+
+    @ApiModelProperty(value = "状态", example = "")
+    private String state;
+
     @ApiModelProperty(hidden = true)
     private Long shopId;
 

--
Gitblit v1.9.1