# Conflicts: # app/src/main/java/com/ydl/component/MainActivity.kt # app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java # config.gradle # m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt # m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt # m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt
