删除无效合并

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.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application.yml
@@ -49,11 +49,7 @@ spring:
    # 国际化资源文件路径
    basename: i18n/messages
  profiles:
-<<<<<<< HEAD
    active: dev
-=======
-    active: local  # （本地）local （生产）prod
->>>>>>> upstream/develop
  # 文件上传
  servlet:
    multipart: