From 31bf3fe30c14ca5d27c470499877a2875cbfc613 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 10:21:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
index 27733e7..856ad56 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -14,6 +14,7 @@
<result column="status" property="status" />
<result column="practical_train_count" property="practicalTrainCount" />
<result column="other_count" property="otherCount" />
+ <result column="mission_state" property="missionState" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="create_by" property="createBy" />
@@ -23,12 +24,13 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, nick_name, phone, account, password, team_name, team_id, status, practical_train_count, other_count, create_time, update_time, create_by, update_by, disabled
+ id, nick_name, phone, account, password, team_name, team_id, status, practical_train_count, other_count,
+ mission_state,create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
SELECT
t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
- t1.practical_train_count,
+ t1.practical_train_count,t1.mission_state,
t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
FROM
t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id
@@ -49,7 +51,7 @@
<select id="pageAuditList" resultType="com.ruoyi.system.vo.TAppUserPageVo">
SELECT
t1.id, t1.nick_name, t1.phone, t1.account, t1.password, t1.team_name, t1.team_id, t1.status,
- t1.practical_train_count,
+ t1.practical_train_count,t1.mission_state,
t1.other_count, t1.create_time, t1.update_time, t1.create_by, t1.update_by, t1.disabled,t2.team_name
FROM
t_app_user t1 left join t_division_team t2 on t1.team_id = t2.id
--
Gitblit v1.7.1