From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
index bd3c97f..a6e6891 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
@@ -5,11 +5,14 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 @ApiModel(value = "JhyInfoListVo", description = "后台集物员列表接口返回参数类")
 public class JhyInfoListVo {
+
+    private Long id;
 
     @ApiModelProperty(value = "姓名")
     private String username;
@@ -20,6 +23,9 @@
     @ApiModelProperty(value = "手机号")
     private String mobile;
 
+    @ApiModelProperty(value = "用户USERID")
+    private String userId;
+
     @ApiModelProperty(value = "身份证号")
     private String identity;
 
@@ -29,15 +35,21 @@
     @ApiModelProperty(value = "身份证正面")
     private String cardPos;
 
-    @ApiModelProperty(value = "是否集物员")
+    @ApiModelProperty(value = "是否集货员 1-是2-否")
     private String isJhy;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "审核状态 1-待审核 2-审核通过 3-审核拒绝")
     private Integer status;
+
+    @ApiModelProperty(value = "集物员积分数")
+    private BigDecimal score;
 
     @ApiModelProperty(value = "申请时间")
     private String createTime;
 
+    @ApiModelProperty(value = "最后登录时间")
+    private String lastLogintime;
+
     @ApiModelProperty(hidden = true)
     private Date createdTime;
 }

--
Gitblit v1.9.1