From d0d4a8004573673e279343985bfe6497bbc9f6bd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 14:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.xml
similarity index 86%
rename from drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml
rename to drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDevicePerShareMapper.xml
index f7be683..13d6ad5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/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>
--
Gitblit v1.9.3