From bb5be7a8a6ac24fbf66f03f070751577b87c95ca Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 15 Apr 2021 17:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
index 5ca3e8c..c2ebdf0 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
@@ -1,17 +1,31 @@
package com.matrix.system.fenxiao.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
@Data
-@ApiModel(value = "ShopSalesmanAppliingVo", description = "查询正在申请分销员的返参")
+@ApiModel(value = "ShopSalesmanAppliingVo", description = "获取分销员待审核记录的返参")
public class ShopSalesmanAppliingVo {
@ApiModelProperty(value = "申请用户id")
private String userId;
+
@ApiModelProperty(value = "分销员")
private String nickname;
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "头像")
+ private String avatarUrl;
+
+ @ApiModelProperty(value = "手机号码")
+ private String phone;
+
}
--
Gitblit v1.9.1