Commit 0bd26728 authored by lixuan's avatar lixuan

Merge branch 'dev-lx' into dev

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
parents 1ad25ad4 6f6b6e56
Pipeline #144871 failed with stages
in 45 minutes and 43 seconds