Merge remote-tracking branch 'origin/main' into dyf-device

# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -93,6 +93,15 @@
         </where>
         order by d.id desc
     </select>
+    <select id="queryAppDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
+        select
+        d.id, d.device_name, d.device_pic, d.device_mac, d.device_sn,
+        d.device_status, d.create_time, d.update_time, d.longitude, d.latitude,
+        d.customer_id, d.current_owner_id, d.original_owner_id, d.customer_name,
+        d.device_imei, d.tenant_id
+        from device d
+        where d.binding_user_id  = #{criteria.bindingUserId}
+    </select>
 
     <!-- 获取分配设备的客户 -->
     <select id="getAssignCustomer" resultType="com.fuyuanshen.equipment.domain.Device">