Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2026-05-23 4bcba729142ded6cd008f324e6a3bae364b6233b

 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">