From 66e89415b0592169ce7e1d1c22c8fd78cc89a83c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 09:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
index 859f822..27b55b5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TQaTestItemMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TQaTestItem">
<id column="id" property="id" />
<result column="team_id" property="teamId" />
+ <result column="commit_person_id" property="commitPersonId" />
<result column="item_name" property="itemName" />
<result column="item_code" property="itemCode" />
<result column="remark" property="remark" />
@@ -22,10 +23,10 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, team_id, item_name, item_code, remark, status, evaluate_person_id, evaluate_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
+ id, team_id,commit_person_id, item_name, item_code, remark, status, evaluate_person_id, evaluate_time, evaluate_score, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TQaTestItemVO">
- select tqti.id, tqti.team_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
+ select tqti.id, tqti.team_id,tqti.commit_person_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
tqti.evaluate_time, tqti.evaluate_score, tqti.create_time, tqti.update_time, tqti.create_by, tqti.update_by, tqti.disabled,
tpt.team_name as teamName
from t_qa_test_item tqti
@@ -55,7 +56,7 @@
</select>
<select id="evaluateList" resultType="com.ruoyi.system.vo.TQaTestItemVO">
- select tqti.id, tqti.team_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
+ select tqti.id, tqti.team_id,tqti.commit_person_id, tqti.item_name, tqti.item_code, tqti.remark, tqti.status, tqti.evaluate_person_id,
tqti.evaluate_time, tqti.evaluate_score, tqti.create_time, tqti.update_time, tqti.create_by, tqti.update_by, tqti.disabled,
tpt.team_name as teamName
from t_qa_test_item tqti
--
Gitblit v1.7.1