From 00f81ed9c631080dfc4595b07d77f73f9563731c Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期二, 25 三月 2025 16:42:35 +0800 Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency --- performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml index 48e6bb2..48ee262 100644 --- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml +++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml @@ -43,6 +43,7 @@ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> + order by create_time desc </sql> <select id="selectAuxiliaryWorkingHoursDay" resultType="com.ruoyi.performance.dto.AuxiliaryWorkingHoursDayDto"> @@ -62,7 +63,7 @@ </select> <select id="selectListByIds" resultType="com.ruoyi.performance.pojo.AuxiliaryWorkingHoursDay"> select * from auxiliary_working_hours_day - where state='宸插鏍�' + where state='宸叉壒鍑�' <if test="ids !=null and ids != ''"> and name_user in <foreach collection="ids" index="index" open="(" separator="," close=")" item="val"> -- Gitblit v1.9.3