Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-12-13 5677ab158fb78d1267c16bbbf29eb690e0b4039f

 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查询设备列表-->