From e564c05b04eb3b7d163be20244a6ffa11448354d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 29 一月 2026 16:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/resources/mapper/ProjectProgressMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin-server/src/main/resources/mapper/ProjectProgressMapper.xml b/admin-server/src/main/resources/mapper/ProjectProgressMapper.xml
index d72b001..814844e 100644
--- a/admin-server/src/main/resources/mapper/ProjectProgressMapper.xml
+++ b/admin-server/src/main/resources/mapper/ProjectProgressMapper.xml
@@ -4,7 +4,7 @@
<select id="pageList" resultType="com.estate.expert.admin.domain.business.projectprogress.ProjectProgress">
- select t1.id,t1.detail,t1.time,t2.name as clientName,t3.name as projectName
+ select t1.id,t1.detail,t1.time,t1.url,t2.name as clientName,t3.name as projectName
from project_progress t1
left join client t2 on t1.client_id = t2.id
left join project t3 on t1.project_id = t3.id
@@ -21,7 +21,7 @@
order by t1.time desc
</select>
<select id="detail" resultType="com.estate.expert.admin.domain.business.projectprogress.ProjectProgress">
- select t1.id,t1.detail,t1.time,t2.name as clientName,t3.name as projectName
+ select t1.id,t1.detail,t1.time,t1.url,t1.client_id,t1.project_id,t2.name as clientName,t3.name as projectName
from project_progress t1
left join client t2 on t1.client_id = t2.id
left join project t3 on t1.project_id = t3.id
--
Gitblit v1.7.1