diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java
index 90c71dc..2375ab2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java
@@ -54,6 +54,16 @@ public class DmGroupTaskRelation extends BaseEntity
@Excel(name = "y")
private Integer y;
+ @Excel(name = "角色类型")
+ private Integer characterType;
+
+ public Integer getCharacterType() {
+ return characterType;
+ }
+
+ public void setCharacterType(Integer characterType) {
+ this.characterType = characterType;
+ }
public Integer getX() {
return x;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java
index d285532..a292061 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java
@@ -53,7 +53,18 @@ public class DmGroupTaskRelationPlus implements Serializable
private Date createTime;
/** 更新时间 */
private Date updateTime;
- public void setId(Long id)
+
+ private Integer characterType;
+
+ public Integer getCharacterType() {
+ return characterType;
+ }
+
+ public void setCharacterType(Integer characterType) {
+ this.characterType = characterType;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml
index 9b845d8..360c0a2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml
@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select id, group_id,`x`,`y`, player_id, player_name, account_id, window_index, window_hwnd, is_master, status, create_time, update_time from dm_group_task_relation
+ select id, character_type,group_id,`x`,`y`, player_id, player_name, account_id, window_index, window_hwnd, is_master, status, create_time, update_time from dm_group_task_relation