Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-system/src/main/resources/mapper/SysUserMapper.xml

@@ -13,5 +13,6 @@
 		   where r1.role_id=r2.role_id 
 		   and r1.name =#{roleName}
 		)
+		and enabled = 1 
 	</select>
 </mapper>