代码修改

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.*;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -41,7 +42,7 @@ public class SysUser extends BaseEntity {
     /**
      * 用户账号
      */
-    @Excel(name = "登录名称")
+    @Excel(name = "账号")
     private String userName;
 
     /**
@@ -51,17 +52,39 @@ public class SysUser extends BaseEntity {
     private String nickName;
 
     /**
-     * 用户邮箱
+     * 部门对象
      */
-    @Excel(name = "用户邮箱")
-    private String email;
+    @Excels({
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT)})
+    @TableField(exist = false)
+    private SysDept dept;
+    
 
     /**
      * 手机号码
      */
-    @Excel(name = "手机号码")
+    @Excel(name = "联系电话")
     private String phoneNum;
 
+
+    /**
+     * 用户邮箱
+     */
+    @Excel(name = "联系邮箱")
+    private String email;
+
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @Excel(name = "状态", readConverterExp = "1=正常,2=停用")
+    private Integer status;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
     /**
      * 用户性别
      */
@@ -77,12 +100,7 @@ public class SysUser extends BaseEntity {
      * 密码
      */
     private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @Excel(name = "帐号状态", readConverterExp = "1=正常,2=停用")
-    private Integer status;
+    
 
     /**
      * 删除标志（0代表存在 2代表删除）
@@ -99,13 +117,6 @@ public class SysUser extends BaseEntity {
      */
     private Date loginDate;
 
-    /**
-     * 部门对象
-     */
-    @Excels({
-            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT)})
-    @TableField(exist = false)
-    private SysDept dept;
 
     /**
      * 角色对象
@@ -163,6 +174,17 @@ public class SysUser extends BaseEntity {
      */
     @TableField(exist = false)
     private String newPwd;
+    
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 
     public Integer getDataPermission() {
         return dataPermission;