Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 6e54b432ab969eccb47b0aa388b95bf14e398790

 ard-work/src/main/resources/mapper/alarmpoints/ArdWallMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.alarmpoints.elecwall.mapper.ArdWallMapper">
<mapper namespace="com.ruoyi.alarmpoints.wall.mapper.ArdWallMapper">
    
    <resultMap type="ArdWall" id="ArdWallResult">
        <result property="id"    column="id"    />