Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

gongchunyi

2026-05-15 1debc99339176e80b3baaf72b55032d191e99f6f

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