From 8e7533cdf52a0ddbff728f931f7b3a3ddb06e098 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 6 Jun 2024 11:19:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=A2=84=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java | 2 +- .../main/resources/mapper/scale/SysInterveneRecordMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java index 503b66f..65d6fae 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/TimeAxisVo.java @@ -24,5 +24,5 @@ public class TimeAxisVo { private String url; - private String note; + private String originalName; } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml index 45955ab..9bb44cc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysInterveneRecordMapper.xml @@ -8,8 +8,8 @@ CONCAT(DATE_FORMAT(ir.create_time, '%Y-%m-%d'), ' ', u.nick_name, '的干预') as `name`, ir.create_time as `time`, 'intervene' as `type`, - ir.diagnose as `note`, - o.url + o.url, + o.original_name from sys_intervene_record ir left join sys_user u on u.user_id = ir.counselor_id left join sys_oss o on o.oss_id = ir.annex