Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

 ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml

@@ -47,8 +47,7 @@
               c.last_task_id,
               c.server_id,
               c.user_id,
               c.dept_id,
               c.box_alias_name
               c.dept_id
        from ard_drone c
                 left join sys_dept d on d.dept_id = c.dept_id
                 left join sys_user u on u.user_id = c.user_id