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

zhanghl

2025-05-16 c3c7756721b8b29585615f6d2c6cb6166f17c7cc

 aps-modules/aps-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.system.mapper.SysRoleDeptMapper">

   <resultMap type="SysRoleDept" id="SysRoleDeptResult">
   <resultMap type="com.aps.system.domain.SysRoleDept" id="SysRoleDeptResult">
      <result property="roleId"     column="role_id"      />
      <result property="deptId"     column="dept_id"      />
   </resultMap>