Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffInfoResultDTO.java

@@ -79,6 +79,11 @@ public class ExtStaffInfoResultDTO implements Serializable {
      * */
     private String adminFlag;
 
+    /**
+     * 手机号
+     * */
+    private String mobile;
+
     /**
      * 用户角色列表
      * */

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -244,6 +244,7 @@
         <result property="profile" column="profile"/>
         <result property="realName" column="realName"/>
         <result property="gridId" column="GRID_ID"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <collection property="roleList" ofType="com.epmet.dto.result.ExtRoleMapResultDTO">
             <result property="roleKey" column="ROLE_KEY" />
@@ -257,6 +258,7 @@
             staff.REAL_NAME AS nickname,
             '' AS PROFILE,
             staff.REAL_NAME AS realName,
+            staff.MOBILE,
             role.ROLE_KEY,
             role.ROLE_NAME,
             vis.GRID_ID