Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-19 fada4b3ee4fbae5f82dba72fe8ad175a724d9cf7

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -98,7 +98,7 @@
            jd.id  = #{districtId}
          and bu.is_deleted = '0'
          and jh.is_deleted = '0'

          and jh.role_type = '1'
    </select>

    <!--根据手机号查询对应账号和手机号的用户信息-->