解决合并冲突

This commit is contained in:
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions

View File

@@ -9,7 +9,8 @@
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="/print-lock.css">
<link rel="icon" href="src/assets/images/ccu.png" />
<link rel="stylesheet" type="text/css" media="print" href="/public/print-lock.css">
<title>医院信息管理系统</title>
<!--[if lt IE 11
]><script>