解决合并冲突

openhis-ui-vue3/src/views/login.vue

@@ -63,6 +63,10 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item prop="tenantId">
+        <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span>
+        <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large"/>
+      </el-form-item>
       <el-form-item class="login-options">
         <el-checkbox v-model="loginForm.rememberMe" class="remember-me">记住我</el-checkbox>
         <el-link type="primary" class="forgot-password" @click="handleForgotPassword">忘记密码？</el-link>
@@ -271,7 +275,7 @@ function handleLogin() {
             }
             return acc;
           }, {});
-          if (true) {
+          if (env === 'development' || !loginForm.value.invokeYb) {
             router.push({ path: redirect.value || '/', query: otherQueryParams });
           } else {
             signIng.value = true;