From 114c0b5aa8bffa7120d7294ba0631d2ef78711c1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 九月 2023 19:13:03 +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/PersonMasterData.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
index d75d269..7c200d0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
@@ -187,7 +187,7 @@
private String flow_middatastatus;
private String employer;
private int mdm_duplicate;
- private EnumerableData gerder_entity;
+ private EnumerableData gender_entity;
private EnumerableData employment_type_entity;
private String gerder;
private String employment_type;
@@ -561,12 +561,12 @@
this.mdm_duplicate = mdm_duplicate;
}
- public EnumerableData getGerder_entity() {
- return gerder_entity;
+ public EnumerableData getGender_entity() {
+ return gender_entity;
}
- public void setGerder_entity(EnumerableData gerder_entity) {
- this.gerder_entity = gerder_entity;
+ public void setGender_entity(EnumerableData gender_entity) {
+ this.gender_entity = gender_entity;
}
public EnumerableData getEmployment_type_entity() {
@@ -659,7 +659,7 @@
@Override
public String toString() {
- return "MasterData{" +
+ return "PersonMasterData{" +
"id='" + id + '\'' +
", lm_code='" + lm_code + '\'' +
", group_code='" + group_code + '\'' +
@@ -705,8 +705,8 @@
", flow_middatastatus='" + flow_middatastatus + '\'' +
", employer='" + employer + '\'' +
", mdm_duplicate=" + mdm_duplicate +
- ", gerder_entity='" + gerder_entity + '\'' +
- ", employment_type_entity='" + employment_type_entity + '\'' +
+ ", gender_entity=" + gender_entity +
+ ", employment_type_entity=" + employment_type_entity +
", gerder='" + gerder + '\'' +
", employment_type='" + employment_type + '\'' +
", employment_type_nane='" + employment_type_nane + '\'' +
--
Gitblit v1.9.3