提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/disposalTemplate.json
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/disposalTemplate.json
@@ -33,11 +33,7 @@
            "top": 22.5,
            "height": 12,
            "width": 88.5,
-<<<<<<< HEAD
-            "title": "长春大学医院",
-=======
            "title": "长春市朝阳区中医院医院",
->>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontSize": 13.5,
@@ -335,8 +331,4 @@
      ]
    }
  ]
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> v1.3