From 9e7a2db4b0c309cd7dd653857302a123211372ce Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index 3533258..38bd80a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -24,44 +24,47 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(2)
- @ApiModelProperty(value = "璐﹀彿")
+ @ValueTableShow(value = 2)
+ @ApiModelProperty(value = "瀹㈡埛璐﹀彿")
private String account;
@ValueTableShow(1)
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String name;
- @ValueTableShow(10)
- @ApiModelProperty(value = "鐘舵��")
+ @ValueTableShow(11)
+ @ApiModelProperty(value = "璐﹀彿鐘舵��")
private Integer state;
@ValueTableShow(5)
- @ApiModelProperty(value = "閭")
+ @ApiModelProperty(value = "鐢靛瓙閭")
private String email;
@ValueTableShow(6)
@ApiModelProperty(value = "鐢佃瘽鍙风爜")
private String phone;
- @ApiModelProperty(value = "閮ㄩ棬")
+ @ApiModelProperty(value = "鎵�鍦ㄩ儴闂�")
private String department;
@ValueTableShow(7)
@ApiModelProperty(value = "瀹㈡埛鍗曚綅")
private String company;
- @ValueTableShow(8)
+ @ValueTableShow(9)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
- @ValueTableShow(9)
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ @ValueTableShow(12)
+ @ApiModelProperty(value = "宸ュ巶鍩�")
+ private String code;
+
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@@ -74,6 +77,18 @@
@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 = "鑻辨枃瀹㈡埛鍗曚綅")
+ private String companyEn;
+
+ @ValueTableShow(10)
+ @ApiModelProperty(value = "鑻辨枃鍗曚綅鍦板潃")
+ private String addressEn;
}
--
Gitblit v1.9.3