Merge branch 'feature/dangjian'

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
      */

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
      */

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"/>