From d50dec2d9b92c103134ae4e313c7bbbe5c2f4432 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 24 四月 2024 16:39:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java | 121 ++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 47 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 9c47ad8..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
@@ -5,116 +5,152 @@
/**
* 闅跺睘鍗曚綅浠ｇ爜
*/
- private String company_code;
+ private String company_code;
+
/**
* 闅跺睘鍗曚綅鍚嶇О/鎵�灞炲叕鍙�
*/
- private String company_name;
+ private String company_name;
+
/**
* 閮ㄩ棬缂栫爜
*/
private String department_code;
+
/**
* 閮ㄩ棬鍚嶇О
*/
private String department_name;
+
/**
* 閮ㄩ棬绫诲瀷 1=鏅�氶儴闂紝2=鍐崇瓥閮ㄩ棬
*/
private String department_type;
+
/**
* 涓婄骇閮ㄩ棬缂栫爜 鎵�灞嬩笂绾ч儴闂紝寮曠敤閮ㄩ棬涓绘暟鎹紝闆嗗洟鍛藉悕鈥滀笂绾ч儴闂ㄤ唬鐮�
*/
- private String parent_department_code;
+ private String parent_department_code;
+
/**
* 涓婄骇閮ㄩ棬鍚嶇О
*/
- private String parent_department_name;
+ private String parent_department_name;
+
/**
* 閮ㄩ棬璐熻矗浜�
*/
- private String department_head;
+ private String department_head;
+
/***
* 璐熻矗浜虹紪鐮�
*/
private String department_head_code;
+
/***
* 鐢佃瘽
*/
private String telephone_number;
+
/***
* 鎺掑簭鍙�
*/
- private String sort_order;
+ private String sort_order;
+
/**
*鍚敤鐘舵�� 1=鏈惎鐢紝2=宸插惎鐢紝3e宸插仠鐢�
*/
- private int enable_datus;
+ private int enable_status;
+
/**
* 閮ㄩ棬灞傜骇
*/
private String department_level;
+
/***
* 鏄铏氭嫙閮ㄩ棬
*/
private String is_virtual;
+
/***
* 閮ㄩ棬鐘舵��,鏈夋晥銆佷綔搴�
*/
- private String department_status;
+ private String department_status;
+
/***
* 閮ㄩ棬鏄剧ず鐘舵��,鏄剧ず銆佷笉鏄剧ず
*/
- private String diplay_status;
+ private String display_status;
+
/***
* 閮ㄩ棬ID璺緞
*/
private String id_route;
+
/***
*閮ㄩ棬鍚嶇О璺緞
*/
private String name_route;
+
/***
*鑺傜偣绫诲瀷,褰撳墠鏂板姞鑺傜偣鐨勭被鍒紝閮ㄩ棬锛屼紒涓�(娉曚汉鍗曚綅)锛岄粯璁�
*/
private String node_type;
+
/***
* 閮ㄩ棬鍘熺紪鐮�,璁板綍璇ラ儴闂ㄧ殑鍘熸湁缂栫爜锛屼綔涓烘崲鍙锋椂鐨勫瑙�
*/
- private String onginal_code;
+ private String original_code;
+
/**
* 鍒涘缓鑰�
*/
private String creator;
+
/***
* 鍒涘缓鏃堕棿
*/
private String createtime;
+
/***
* 淇敼鑰�
*/
private String modifier;
+
/**
* 淇敼鏃堕棿
*/
private String modifytime;
+
private String mdm_parentcode;
+
private int mdm_workflow_status;
+
private String mdm_datastatus;
+
private String mdm_cleanstatus;
+
private String link_fieldvalue;
- private String floy_middatastatus;
- private String originalcode;
+
+ private String flow_middatastatus;
+
private String pk_mdm;
+
private String mdm_duplicate;
+
private String mdm_code;
+
private String mdm_version;
- private String original_nane;
+
+ private String original_name;
+
private String ts;
+
/***
*0:姝ｅ父锛�1鏁版嵁琚垹闄わ紝榛樿涓�0;
*/
private int dr;
+
private String dr_ndm_code;
public String getCompany_code() {
@@ -205,12 +241,12 @@
this.sort_order = sort_order;
}
- public int getEnable_datus() {
- return enable_datus;
+ public int getEnable_status() {
+ return enable_status;
}
- public void setEnable_datus(int enable_datus) {
- this.enable_datus = enable_datus;
+ public void setEnable_status(int enable_status) {
+ this.enable_status = enable_status;
}
public String getDepartment_level() {
@@ -237,12 +273,12 @@
this.department_status = department_status;
}
- public String getDiplay_status() {
- return diplay_status;
+ public String getDisplay_status() {
+ return display_status;
}
- public void setDiplay_status(String diplay_status) {
- this.diplay_status = diplay_status;
+ public void setDisplay_status(String display_status) {
+ this.display_status = display_status;
}
public String getId_route() {
@@ -269,12 +305,12 @@
this.node_type = node_type;
}
- public String getOnginal_code() {
- return onginal_code;
+ public String getOriginal_code() {
+ return original_code;
}
- public void setOnginal_code(String onginal_code) {
- this.onginal_code = onginal_code;
+ public void setOriginal_code(String original_code) {
+ this.original_code = original_code;
}
public String getCreator() {
@@ -349,20 +385,12 @@
this.link_fieldvalue = link_fieldvalue;
}
- public String getFloy_middatastatus() {
- return floy_middatastatus;
+ public String getFlow_middatastatus() {
+ return flow_middatastatus;
}
- public void setFloy_middatastatus(String floy_middatastatus) {
- this.floy_middatastatus = floy_middatastatus;
- }
-
- public String getOriginalcode() {
- return originalcode;
- }
-
- public void setOriginalcode(String originalcode) {
- this.originalcode = originalcode;
+ public void setFlow_middatastatus(String flow_middatastatus) {
+ this.flow_middatastatus = flow_middatastatus;
}
public String getPk_mdm() {
@@ -397,12 +425,12 @@
this.mdm_version = mdm_version;
}
- public String getOriginal_nane() {
- return original_nane;
+ public String getOriginal_name() {
+ return original_name;
}
- public void setOriginal_nane(String original_nane) {
- this.original_nane = original_nane;
+ public void setOriginal_name(String original_name) {
+ this.original_name = original_name;
}
public String getTs() {
@@ -443,15 +471,14 @@
", department_head_code='" + department_head_code + '\'' +
", telephone_number='" + telephone_number + '\'' +
", sort_order='" + sort_order + '\'' +
- ", enable_datus=" + enable_datus +
+ ", enable_status=" + enable_status +
", department_level='" + department_level + '\'' +
", is_virtual='" + is_virtual + '\'' +
", department_status='" + department_status + '\'' +
- ", diplay_status='" + diplay_status + '\'' +
+ ", display_status='" + display_status + '\'' +
", id_route='" + id_route + '\'' +
", name_route='" + name_route + '\'' +
", node_type='" + node_type + '\'' +
- ", onginal_code='" + onginal_code + '\'' +
", creator='" + creator + '\'' +
", createtime='" + createtime + '\'' +
", modifier='" + modifier + '\'' +
@@ -461,13 +488,13 @@
", mdm_datastatus='" + mdm_datastatus + '\'' +
", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
", link_fieldvalue='" + link_fieldvalue + '\'' +
- ", floy_middatastatus='" + floy_middatastatus + '\'' +
- ", originalcode='" + originalcode + '\'' +
+ ", flow_middatastatus='" + flow_middatastatus + '\'' +
+ ", original_code='" + original_code + '\'' +
", pk_mdm='" + pk_mdm + '\'' +
", mdm_duplicate='" + mdm_duplicate + '\'' +
", mdm_code='" + mdm_code + '\'' +
", mdm_version='" + mdm_version + '\'' +
- ", original_nane='" + original_nane + '\'' +
+ ", original_name='" + original_name + '\'' +
", ts='" + ts + '\'' +
", dr=" + dr +
", dr_ndm_code='" + dr_ndm_code + '\'' +
--
Gitblit v1.9.3