user_role表添加网格ID字段

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java

@@ -44,6 +44,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户角色关系表 
  *
@@ -43,6 +40,11 @@ public class UserRoleEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java

@@ -37,6 +37,9 @@ public class UserRoleExcel {
     @Excel(name = "客户Id customer.id")
     private String customerId;
 
+    @Excel(name = "网格ID")
+    private String gridId;
+
     @Excel(name = "用户Id user.id")
     private String userId;
 

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

@@ -6,6 +6,7 @@
     <resultMap type="com.epmet.entity.UserRoleEntity" id="userRoleMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="roleId" column="ROLE_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>