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/PersonMasterData.java | 115 +++++++++++++++++++++++++++++----------------------------
1 files changed, 58 insertions(+), 57 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 e021e1f..16381da 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
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.vo.webserviceModel.person;
public class PersonMasterData {
+
/***
* 鏁版嵁鍦ㄦ绯荤粺涓敮涓�鏍囪瘑
*/
@@ -54,7 +55,7 @@
/***
* 绫嶈疮
*/
- private String citiizenship;
+ private String citizenship;
/**
* 鍥藉/鍦板尯
@@ -112,7 +113,7 @@
private String mobile_phone;
/***
- * 鍚嶆棌
+ * 姘戞棌
*/
private String nationality;
@@ -156,7 +157,7 @@
*/
private String worker_category;
- /***
+ /**
* 浜哄憳绫诲埆缂栫爜
*/
private String worker_category_code;
@@ -197,7 +198,7 @@
private String business_level_code;
/**
- * 鍟嗗瘑绛夌骇缂栫爜
+ * 鍟嗗瘑绛夌骇鍚嶇О
*/
private String business_level_name;
@@ -348,12 +349,36 @@
this.birthplace = birthplace;
}
- public String getCitiizenship() {
- return citiizenship;
+ public String getCitizenship() {
+ return citizenship;
}
- public void setCitiizenship(String citiizenship) {
- this.citiizenship = citiizenship;
+ public void setCitizenship(String citizenship) {
+ this.citizenship = citizenship;
+ }
+
+ public String getWorker_category_code() {
+ return worker_category_code;
+ }
+
+ public String getWorker_level_code() {
+ return worker_level_code;
+ }
+
+ public String getCountry_level_code() {
+ return country_level_code;
+ }
+
+ public String getCountry_level_name() {
+ return country_level_name;
+ }
+
+ public String getBusiness_level_code() {
+ return business_level_code;
+ }
+
+ public String getBusiness_level_name() {
+ return business_level_name;
}
public String getCountry() {
@@ -362,6 +387,30 @@
public void setCountry(String country) {
this.country = country;
+ }
+
+ public void setWorker_category_code(String worker_category_code) {
+ this.worker_category_code = worker_category_code;
+ }
+
+ public void setWorker_level_code(String worker_level_code) {
+ this.worker_level_code = worker_level_code;
+ }
+
+ public void setCountry_level_code(String country_level_code) {
+ this.country_level_code = country_level_code;
+ }
+
+ public void setCountry_level_name(String country_level_name) {
+ this.country_level_name = country_level_name;
+ }
+
+ public void setBusiness_level_code(String business_level_code) {
+ this.business_level_code = business_level_code;
+ }
+
+ public void setBusiness_level_name(String business_level_name) {
+ this.business_level_name = business_level_name;
}
public String getDept_type() {
@@ -534,54 +583,6 @@
public String getWorker_level() {
return worker_level;
- }
-
- public String getWorker_category_code() {
- return worker_category_code;
- }
-
- public String getWorker_level_code() {
- return worker_level_code;
- }
-
- public String getCountry_level_code() {
- return country_level_code;
- }
-
- public String getCountry_level_name() {
- return country_level_name;
- }
-
- public String getBusiness_level_code() {
- return business_level_code;
- }
-
- public String getBusiness_level_name() {
- return business_level_name;
- }
-
- public void setWorker_category_code(String worker_category_code) {
- this.worker_category_code = worker_category_code;
- }
-
- public void setWorker_level_code(String worker_level_code) {
- this.worker_level_code = worker_level_code;
- }
-
- public void setCountry_level_code(String country_level_code) {
- this.country_level_code = country_level_code;
- }
-
- public void setCountry_level_name(String country_level_name) {
- this.country_level_name = country_level_name;
- }
-
- public void setBusiness_level_code(String business_level_code) {
- this.business_level_code = business_level_code;
- }
-
- public void setBusiness_level_name(String business_level_name) {
- this.business_level_name = business_level_name;
}
public void setWorker_level(String worker_level) {
@@ -785,7 +786,7 @@
", admin_division_code='" + admin_division_code + '\'' +
", birthday='" + birthday + '\'' +
", birthplace='" + birthplace + '\'' +
- ", citiizenship='" + citiizenship + '\'' +
+ ", citizenship='" + citizenship + '\'' +
", country='" + country + '\'' +
", dept_type='" + dept_type + '\'' +
", dept_name='" + dept_name + '\'' +
--
Gitblit v1.9.3