From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java b/java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java
index 36202d8..535e0b4 100644
--- a/java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java
@@ -22,6 +22,7 @@
private String staffName;
private String[] staffIds;
private String relCd;
+ private String relCdName;
private String departmentId;
private String departmentName;
private String companyId;
@@ -146,4 +147,12 @@
public void setStaffName(String staffName) {
this.staffName = staffName;
}
+
+ public String getRelCdName() {
+ return relCdName;
+ }
+
+ public void setRelCdName(String relCdName) {
+ this.relCdName = relCdName;
+ }
}
--
Gitblit v1.8.0