From 2e89bb115815ca329c6fd54d6d987779791c657c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:37 +0800
Subject: [PATCH] 大改用户和客户
---
user-server/src/main/java/com/yuanchu/mom/pojo/Custom.java | 66 ++++++++++++--------------------
1 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Custom.java
similarity index 62%
rename from user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
rename to user-server/src/main/java/com/yuanchu/mom/pojo/Custom.java
index 38bd80a..c5f3639 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Custom.java
@@ -1,7 +1,9 @@
-package com.yuanchu.mom.dto;
+package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
@@ -17,53 +19,34 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor
-@TableName("user")
+@TableName("custom")
public class Custom extends OrderBy implements Serializable {
@ApiModelProperty(value = "涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- @ValueTableShow(value = 2)
- @ApiModelProperty(value = "瀹㈡埛璐﹀彿")
- private String account;
+ @TableId(type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ValueTableShow(1)
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
- private String name;
-
- @ValueTableShow(11)
- @ApiModelProperty(value = "璐﹀彿鐘舵��")
- private Integer state;
-
- @ValueTableShow(5)
- @ApiModelProperty(value = "鐢靛瓙閭")
- private String email;
-
- @ValueTableShow(6)
- @ApiModelProperty(value = "鐢佃瘽鍙风爜")
- private String phone;
-
- @ApiModelProperty(value = "鎵�鍦ㄩ儴闂�")
- private String department;
-
- @ValueTableShow(7)
- @ApiModelProperty(value = "瀹㈡埛鍗曚綅")
private String company;
- @ValueTableShow(9)
+ @ValueTableShow(3)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
- @ValueTableShow(12)
+ @ValueTableShow(8)
@ApiModelProperty(value = "宸ュ巶鍩�")
private String code;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
+ private String code2;
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ValueTableShow(13)
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -77,18 +60,19 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(14)
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
- @TableField(exist = false)
- private String updateUserName;
-
- private Integer isCustom;
-
- @ValueTableShow(8)
- @ApiModelProperty(value = "鑻辨枃瀹㈡埛鍗曚綅")
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "瀹㈡埛鍗曚綅EN")
private String companyEn;
- @ValueTableShow(10)
- @ApiModelProperty(value = "鑻辨枃鍗曚綅鍦板潃")
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "鍗曚綅鍦板潃EN")
private String addressEn;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "鍔犳�ラ搴�")
+ private Integer num;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鍗曚綅鐢佃瘽")
+ private String phone;
}
--
Gitblit v1.9.3