diff --git a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml index 62b9121..6295035 100644 --- a/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/XmpjqdMapper.xml @@ -73,7 +73,18 @@ AND a.end_time = #{req.endTime} - group by a.id + group by a.id, + a.name, + a.begain_time, + a.end_time, + a.xzfl, + a.xmfrdwxz, + a.ztze, + b.floor, + b.scgd, + b.two_and_four_cg , + b.scdmhz, + b.two_and_three_lmhz order by a.ztze asc