Merge remote-tracking branch 'origin/5.X' into 5.X

ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml

@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEquipmentVoPage" resultType="org.dromara.web.domain.vo.EqUserEquipmentVo">
         SELECT
-            e.user_id,
+            s.user_id,
             s.nick_name,
-            e.user_name,
+            s.user_name,
             COUNT(e.equipment_id) AS bind_num, -- 设备总数
             SUM(CASE WHEN e.line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数
             SUM(CASE WHEN e.line_status = 1 THEN 1 ELSE 0 END) AS online_num -- 在线个数
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY
-            e.user_id,e.user_name, s.nick_name
+            s.user_id,s.user_name, s.nick_name
     </select>
 
     <select id="selectEquipmentStatistic" resultType="org.dromara.web.domain.vo.EqEquipmentStatisticsVo">