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

buhuazhen

7 天以前 5ddc232b8dffcb3402711874491df35fb1997d1d

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