# Conflicts: # im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java # im-uniapp/pages/login/login.vue