Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -29,7 +29,7 @@
        from sys_post
    </sql>

    <select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
    <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
        select p.post_id
        from sys_post p
                 left join sys_user_post up on up.post_id = p.post_id
@@ -45,4 +45,4 @@
        where u.user_name = #{userName}
    </select>

</mapper> 
</mapper>