From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 6665c0a..59c4080 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import cc.mrbird.febs.vip.entity.MallVipConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -95,4 +96,7 @@
@ApiModelProperty(value = "是否是推销员")
private Integer isSale;
+
+ @ApiModelProperty(value = "会员信息")
+ private MallVipConfig vipInfo;
}
--
Gitblit v1.9.1