From 6ca23797c5221b37b18247c7a610da70a05913a9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 23 四月 2024 01:35:28 +0800
Subject: [PATCH] 功能调整

---
 user-server/src/main/java/com/yuanchu/mom/pojo/User.java |   96 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index d8ba49b..fb036d2 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -1,39 +1,117 @@
 package com.yuanchu.mom.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class User {
+@TableName("user")
+public class User extends OrderBy implements Serializable{
 
+    @ApiModelProperty(value = "涓婚敭")
     @TableId(type = IdType.AUTO)
     private Integer id;
 
+    @ValueTableShow(1)
+    @ApiModelProperty(value = "璐﹀彿")
     private String account;
 
+    @ApiModelProperty(value = "瀵嗙爜")
     private String password;
 
+    @ValueTableShow(2)
+    @ApiModelProperty(value = "鐢ㄦ埛鍚�")
     private String name;
 
-    private int state;
+    @ValueTableShow(3)
+    @ApiModelProperty(value = "鐘舵��")
+    private Integer state;
 
+    @ValueTableShow(4)
+    @ApiModelProperty(value = "骞撮緞")
+    private Integer age;
+
+    @ValueTableShow(5)
+    @ApiModelProperty(value = "閭")
+    private String email;
+
+    @ValueTableShow(6)
+    @ApiModelProperty(value = "鐢佃瘽鍙风爜")
+    private String phone;
+
+    @ValueTableShow(7)
+    @ApiModelProperty(value = "閮ㄩ棬")
+    private String department;
+
+    @ValueTableShow(8)
+    @ApiModelProperty(value = "鍗曚綅")
+    private String company;
+
+    @ValueTableShow(8)
+    @ApiModelProperty(value = "鍗曚綅鍦板潃")
+    private String address;
+
+    @ApiModelProperty(value = "瑙掕壊涓婚敭")
+    private Integer roleId;
+
+    @ValueTableShow(9)
+    @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
 
+    @ValueTableShow(10)
+    @ApiModelProperty(value = "鏇存柊鏃ユ湡")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 
-    private int version;
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    private Integer isCustom;
+
+    private String code;
+
+    /**
+     * 绛惧悕鐓х墖鍦板潃
+     */
+    @ValueTableShow(value = 12,name = "绛惧悕鐓х墖鍦板潃")
+    private String signatureUrl;
+
+    /**
+     * 鑷韩鐓х墖鍦板潃
+     */
+    @ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
+    private String pictureUrl;
+
+    /**
+     * 缁勭粐
+     */
+    @ValueTableShow(value = 14,name = "缁勭粐")
+    @ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
+    private String departId;
 
 }

--
Gitblit v1.9.3