From 23c6050be4333c783ad4f7e12a735a7b4744edaa Mon Sep 17 00:00:00 2001 From: liupanting Date: Fri, 21 Feb 2025 15:47:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?pom.xml=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openhis-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openhis-server/pom.xml b/openhis-server/pom.xml index b81d0790..7a6e5e3c 100644 --- a/openhis-server/pom.xml +++ b/openhis-server/pom.xml @@ -36,7 +36,7 @@ 5.7.12 5.3.39 1.18.26 - 3.4.2 + 3.5.3 6.8.0 From a26b626e5ff0671c4f35fef826082fe6d20e33a4 Mon Sep 17 00:00:00 2001 From: liupanting Date: Fri, 21 Feb 2025 15:49:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datadictionary/dto/{DiseaseInDto.java => DiseaseDto.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/{DiseaseInDto.java => DiseaseDto.java} (96%) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseDto.java similarity index 96% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseDto.java index 1b32fbc2..f91b6963 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseInDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class DiseaseInDto { +public class DiseaseDto { /** 所属分类 */ private Integer sourceEnum; From 0ad32e695d64e3a00a7206c0183a1918e88c2766 Mon Sep 17 00:00:00 2001 From: Zhuangxingyu Date: Mon, 24 Feb 2025 15:23:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=20sql?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper}/ChargeItemDefSearchMapper.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename openhis-server/openhis-application/src/main/{java/com/openhis/web/datadictionary/mapper/xml => resources/mapper}/ChargeItemDefSearchMapper.xml (95%) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml similarity index 95% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml rename to openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml index 0c4568cc..0c54714a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/xml/ChargeItemDefSearchMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/ChargeItemDefSearchMapper.xml @@ -1,7 +1,5 @@ - +