提交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-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -5,8 +5,6 @@
            resultType="com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto">

        SELECT
-<<<<<<< HEAD
-=======
        T3.id,
        T3.category_code,
        T3.bus_no,
@@ -37,7 +35,6 @@
        FROM
        (
        SELECT
->>>>>>> v1.3
        T1.id,
        T1.category_code,
        T1.bus_no,