解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
@@ -62,7 +62,11 @@ spring:
  # redis 配置
  redis:
    # 地址
+<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-test.yml
    host: 192.168.110.252
+=======
+    host: localhost
+>>>>>>> upstream/develop:openhis-server-new/openhis-application/src/main/resources/application-local.yml
    # 端口，默认为6379
    port: 6379
    # 数据库索引