From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 13 十二月 2023 16:53:39 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml index 5964eff..945127c 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml @@ -168,7 +168,7 @@ #{id} </foreach> </where> - ORDER BY me.equipment_id + ORDER BY sd.depart_order </select> <!--鏍规嵁璁惧缂栧彿鏌ヨ璁惧淇℃伅鍜屼骇绾夸俊鎭�--> @@ -191,7 +191,7 @@ #{id} </foreach> </where> - ORDER BY me.equipment_id + ORDER BY mp.production_order </select> <!--鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃--> -- Gitblit v1.9.3