Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/model/dto/SysUserTeamInfoDto.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.model.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserInfo;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.Optional;
 
 @ApiModel("认证查询人员信息")
@@ -38,6 +40,10 @@ public class SysUserTeamInfoDto {
     @ApiModelProperty("人员信息")
     private SysUserInfo userInfo;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("注册时间")
+    private Date createTime;
+
     public SysUserTeamInfoDto(SysUser sysUser, SysDept sysDept, SysDept  organization, SysUserInfo sysUserInfo) {
         this.organization = organization.getName();
         this.deptId = sysDept.getId();
@@ -46,6 +52,7 @@ public class SysUserTeamInfoDto {
         this.name = sysUser.getName();
         this.phone = sysUser.getMobile();
         this.state = sysUser.getStatus();
+        this.createTime = sysUser.getCreateTime();
         this.userInfo = Optional.ofNullable(sysUserInfo).orElse(new SysUserInfo());
     }
 }