解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/views/index.vue
+++ b/openhis-ui-vue3/src/views/index.vue
@@ -462,7 +462,7 @@ onMounted(() => {
  
  .el-button{
    border: 1px #166773 solid;
-    span{
+    span {
      color: red;
      margin-left: 5px;
    }
@@ -471,7 +471,7 @@ onMounted(() => {
  .el-button:hover{
    border: 1px #166773 solid;
    color: #166773;
-    span{
+    span {
      color: red;
      margin-left: 5px;
    }