From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
src/main/java/org/springblade/modules/system/entity/User.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 1277773..64df805 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -145,7 +145,7 @@
@ApiModelProperty(value = "联系地址")
private String address;
/**
- * 户口所在地
+ * 身份证住址
*/
@ApiModelProperty(value = "户口所在地")
private String registered ;
@@ -266,4 +266,15 @@
*/
@TableField("equipment_code")
private String equipmentCode;
+
+ /**
+ * 从业单位名称
+ */
+ @TableField("unit_name")
+ private String unitName;
+
+ /**
+ * 是否冻结 0：否 1：是
+ */
+ private Integer isFreeze;
}
--
Gitblit v1.9.3