From c3c697c559e06a22dc2060c5bf7c6a7357175505 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Tue, 4 Jul 2023 14:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E8=A7=82=E5=AF=9F=E5=91=98(?=
 =?UTF-8?q?=E9=AA=91=E5=A3=AB=E5=85=88=E9=94=8B)=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B6=E5=AE=83=E8=A1=8C=E4=B8=9A=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5:COURIE=5FTEXT=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java | 5 +++++
 .../elink/esua/epdc/party/entity/KnightPionnerEntity.java    | 5 +++++
 .../src/main/resources/mapper/KnightPionnerDao.xml           | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java
index a3deb1241..6f6702f00 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java
@@ -68,6 +68,11 @@ public class KnightPionnerDTO implements Serializable {
      */
     private Integer courier;
 
+    /**
+     * 其它类型的补充名称
+     */
+    private String courierText;
+
     /**
      * 居住网格id
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java
index 589484fe9..3db1d05f4 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java
@@ -66,6 +66,11 @@ public class KnightPionnerEntity extends DeptScope {
 	 */
 	private Integer courier;
 
+	/**
+	 * 其它类型的补充名称
+	 */
+	private String courierText;
+
     /**
      * 居住网格id
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/KnightPionnerDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/KnightPionnerDao.xml
index 3363db543..807fab62b 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/KnightPionnerDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/KnightPionnerDao.xml
@@ -10,6 +10,8 @@
         <result property="mobile" column="MOBILE"/>
         <result property="workUnit" column="WORK_UNIT"/>
         <result property="party" column="PARTY"/>
+        <result property="courier" column="COURIER"/>
+        <result property="courierText" column="COURIE_TEXT"/>
         <result property="deptId" column="DEPT_ID"/>
         <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
         <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>