From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoDetailVo.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoDetailVo.java
index e304ec6..ea25f93 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoDetailVo.java
@@ -2,10 +2,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
+import com.matrix.system.hive.bean.SysVipLabel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -13,6 +15,18 @@
**/
@ApiModel(value = "VipInfoDetailVo", description = "客户详细信息接口返回类")
public class VipInfoDetailVo {
+
+ @ApiModelProperty(value = "头像")
+ private String photo;
+
+ @ApiModelProperty(value = "资金密码")
+ private String password;
+
+ @ApiModelProperty(value = "会员ID")
+ private Long id;
+
+ @ApiModelProperty(value = "会员编号")
+ private String vipNo;
@ApiModelProperty(value = "会员姓名")
private String vipName;
@@ -47,6 +61,33 @@
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "标签")
+ private List<SysVipLabel> labels;
+
+ public List<SysVipLabel> getLabels() {
+ return labels;
+ }
+
+ public void setLabels(List<SysVipLabel> labels) {
+ this.labels = labels;
+ }
+
+ public String getVipNo() {
+ return vipNo;
+ }
+
+ public void setVipNo(String vipNo) {
+ this.vipNo = vipNo;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
public String getVipName() {
return vipName;
@@ -135,4 +176,20 @@
public void setRemark(String remark) {
this.remark = remark;
}
+
+ public String getPhoto() {
+ return photo;
+ }
+
+ public void setPhoto(String photo) {
+ this.photo = photo;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
--
Gitblit v1.9.1