解决合并冲突

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