解决合并冲突

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/medicationmanagement/purchaseDocument/components/templateJson.json
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json
@@ -33,7 +33,7 @@
            "top": 13.5,
            "height": 12,
            "width": 75,
-            "title": "医院",
+            "title": "长春大学医院",
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontSize": 12,
@@ -84,7 +84,7 @@
            "top": 33,
            "height": 9.75,
            "width": 120,
-            "title": "机构：医院",
+            "title": "机构：长春大学医院",
            "coordinateSync": false,
            "widthHeightSync": false,
            "qrCodeLevel": 0