From 5dd6f4aa2123671e95907ee19f5925a98983cdc8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 三月 2024 10:05:07 +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 | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 9d0edef..9c47ad8 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
@@ -9,7 +9,6 @@
/**
* 闅跺睘鍗曚綅鍚嶇О/鎵�灞炲叕鍙�
*/
-
private String company_name;
/**
* 閮ㄩ棬缂栫爜
@@ -106,7 +105,7 @@
private String link_fieldvalue;
private String floy_middatastatus;
private String originalcode;
- private String pk_mdn;
+ private String pk_mdm;
private String mdm_duplicate;
private String mdm_code;
private String mdm_version;
@@ -366,12 +365,12 @@
this.originalcode = originalcode;
}
- public String getPk_mdn() {
- return pk_mdn;
+ public String getPk_mdm() {
+ return pk_mdm;
}
- public void setPk_mdn(String pk_mdn) {
- this.pk_mdn = pk_mdn;
+ public void setPk_mdm(String pk_mdn) {
+ this.pk_mdm = pk_mdn;
}
public String getMdm_duplicate() {
@@ -464,7 +463,7 @@
", link_fieldvalue='" + link_fieldvalue + '\'' +
", floy_middatastatus='" + floy_middatastatus + '\'' +
", originalcode='" + originalcode + '\'' +
- ", pk_mdn='" + pk_mdn + '\'' +
+ ", pk_mdm='" + pk_mdm + '\'' +
", mdm_duplicate='" + mdm_duplicate + '\'' +
", mdm_code='" + mdm_code + '\'' +
", mdm_version='" + mdm_version + '\'' +
--
Gitblit v1.9.3