Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-22 64c7668818aa8272c0aae206a3c0f7007ca38e5d

 ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.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.app.mapper.ArdAppPositionMapper">
<mapper namespace="com.ruoyi.app.position.mapper.ArdAppPositionMapper">
    <resultMap type="ArdAppPosition" id="ArdAppPositionResult">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>