diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java index e5f599b49a..f7ef5d6446 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java +++ b/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 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java index 6fd5a23f7f..dbce8f7a77 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java +++ b/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 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java index 0ac921f68e..4f21696f49 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java +++ b/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; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index dc4a525517..e33db2134f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -6,6 +6,7 @@ +