提交merge1.3

openhis-ui-vue3/index.html

@@ -5,6 +5,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
+<<<<<<< HEAD
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     
     <!-- SEO 和描述信息 -->
@@ -35,6 +36,14 @@
     <link rel="icon" href="/favicon/favicon.svg" type="image/svg+xml">
     <!-- 打印样式按需加载 -->
     <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css" onload="this.media='all'">
+=======
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+    />
+    <link rel="icon" href="src/assets/images/ccu.png" />
+    <link rel="stylesheet" type="text/css" media="print" href="/public/print-lock.css" />
+>>>>>>> v1.3
     <title>医院信息管理系统</title>
     <!--[if lt IE 11]>
       <script>