Merge remote-tracking branch 'origin/master'

rain

2026-01-29 d0d4a8004573673e279343985bfe6497bbc9f6bd

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.xml

File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.fw.fwDevicePerShare.mapper.FwDevicePerShareMapper">
<mapper namespace="org.sxkj.fw.device.mapper.FwDevicePerShareMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="fwDevicePerShareResultMap" type="org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity">
    <resultMap id="fwDevicePerShareResultMap" type="org.sxkj.fw.device.entity.FwDevicePerShareEntity">
        <result column="id" property="id"/>
        <result column="device_sn" property="deviceSn"/>
        <result column="device_id" property="deviceId"/>
        <result column="loan_from_dept_id" property="loanFromDeptId"/>
        <result column="loan_to_dept_id" property="loanToDeptId"/>
        <result column="device_per_menu_id" property="devicePerMenuId"/>
        <result column="area_code" property="areaCode"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
@@ -26,7 +25,7 @@
    </select>


    <select id="exportFwDevicePerShare" resultType="org.sxkj.fw.fwDevicePerShare.excel.FwDevicePerShareExcel">
    <select id="exportFwDevicePerShare" resultType="org.sxkj.fw.device.excel.FwDevicePerShareExcel">
        SELECT * FROM ja_fw_device_per_share ${ew.customSqlSegment}
    </select>