From d028887a3c9454578b9bc3acc37f29856643fc4e Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 2 Dec 2025 10:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=B5=81=E5=8A=A8=E4=BA=BA=E5=91=98=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java   | 4 ++++
 .../main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java    | 1 +
 .../main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java    | 4 ++++
 .../java/com/zcloud/basic/info/dto/clientobject/UserCO.java   | 4 +++-
 .../main/java/com/zcloud/basic/info/domain/model/UserE.java   | 2 ++
 .../com/zcloud/basic/info/persistence/dataobject/UserDO.java  | 3 +++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java
index 3065da4..be2055b 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java
@@ -126,5 +126,9 @@ public class UserAddCmd extends Command {
     @ApiModelProperty(value = "岗位名称")
     private String postName;
 
+    // 入职状态
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
+    private Integer flowFlag;
+
 }
 
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java
index 167a9bf..c2ac184 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java
@@ -87,5 +87,6 @@ public class UserUpdateCmd extends Command {
     private String politicalAffiliation;
     @ApiModelProperty(value = "政治面貌名称", name = "politicalAffiliationName")
     private String politicalAffiliationName;
+
 }
 
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java
index 633b8d2..fbd4a05 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java
@@ -132,5 +132,9 @@ public class UserXgfAddCmd extends Command {
     private String departmentName;
     @ApiModelProperty(value = "岗位名称")
     private String postName;
+
+    // 入职状态
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
+    private Integer flowFlag;
 }
 
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
index c3f81e9..5e8e663 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
@@ -171,7 +171,9 @@ public class UserCO extends ClientObject {
     // 入职状态
     @ApiModelProperty(value = "入职状态 1-在职 0-离职")
     private Integer employmentFlag;
-
+    // 入职状态
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
+    private Integer flowFlag;
 
     // 年龄
     @ApiModelProperty(value = "年龄")
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
index 6db4ec2..7ae72e7 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
@@ -135,6 +135,8 @@ public class UserE extends BaseE {
     private String newPassword;
     // 入职状态
     private Integer employmentFlag;
+    // 入职状态
+    private Integer flowFlag;
     // 父级租户id
     private final Long parentTenantId = 1989259383784415232L;
     // 默认密码
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java
index 7d44a96..21f25b0 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java
@@ -125,6 +125,9 @@ public class UserDO extends BaseDO {
     // 入职状态
     @ApiModelProperty(value = "入职状态")
     private Integer employmentFlag;
+    // 入职状态
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
+    private Integer flowFlag;
 
 
     //密码