From 5f0d9a00a1e0f27c2f8396dcd98fac5022aa40c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:48:04 +0800
Subject: [PATCH] 内网开发环境代码合并

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
index 731cb06..2b61960 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
@@ -55,7 +55,7 @@
 	/***
 	 * 鎺掑簭鍙�
 	 */
-	private  String sort_order;
+	private String sort_order;
 
 	/**
 	 *鍚敤鐘舵�� 1=鏈惎鐢紝2=宸插惎鐢紝3e宸插仠鐢�
@@ -75,7 +75,7 @@
 	/***
 	 * 閮ㄩ棬鐘舵��,鏈夋晥銆佷綔搴�
 	 */
-	private  String department_status;
+	private String department_status;
 
 	/***
 	 * 閮ㄩ棬鏄剧ず鐘舵��,鏄剧ず銆佷笉鏄剧ず
@@ -488,7 +488,7 @@
 			", mdm_datastatus='" + mdm_datastatus + '\'' +
 			", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
 			", link_fieldvalue='" + link_fieldvalue + '\'' +
-			", floy_middatastatus='" + flow_middatastatus + '\'' +
+			", flow_middatastatus='" + flow_middatastatus + '\'' +
 			", original_code='" + original_code + '\'' +
 			", pk_mdm='" + pk_mdm + '\'' +
 			", mdm_duplicate='" + mdm_duplicate + '\'' +

--
Gitblit v1.9.3