Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

2026-05-22 9944c43ec57c79d3eb72f09ac797e9d2b772dedd

 src/main/resources/mapper/system/SysRoleMapper.xml

@@ -62,6 +62,7 @@
   
   <select id="selectRoleAll" resultMap="SysRoleResult">
      <include refid="selectRoleVo"/>
      WHERE r.del_flag = '0'
   </select>
   
   <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">