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

zss

5 天以前 1942fb9f1a4dd6a90daca24e3a093c138e0e48c3

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