删除无效合并

2025-12-10 15:28:29 +08:00
parent b0eb9861b9
commit b1117b4157
10 changed files with 0 additions and 730 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,11 +62,7 @@ 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
    # 数据库索引