提交merge1.3

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

@@ -65,22 +65,8 @@
       </el-form-item>
       <el-form-item prop="tenantId">
         <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span>
-<<<<<<< HEAD
-        <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>
-      </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-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large" />
       </el-form-item>
->>>>>>> v1.3
       <!--<el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
@@ -137,9 +123,6 @@
         <span><el-link :underline="false">Cookies</el-link></span>
       </div>
       <span>
-<<<<<<< HEAD
-        <el-link :underline="false">Copyright © 2025 上海经创贺联信息技术有限公司 All Rights Reserved. </el-link>
-=======
         <el-link
           :underline="false"
           href="https://open.tntlinking.com/communityTreaty"
@@ -148,7 +131,6 @@
           >Copyright © 2025 湖北天天数链技术有限公司 本系统软件源代码许可来源于
           天天开源软件（社区版）许可协议 https://open.tntlinking.com/communityTreaty
         </el-link>
->>>>>>> v1.3
       </span>
     </div>
   </div>