提交merge1.3

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