From c0a1e58617d69fa78cceebb27376e57e324a562e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 21 八月 2024 08:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
index eab3c3a..b81536f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
     profiles:
-        include: global, database
+        include: global, database, database-ym, database-pj
 
 #actutor鐨剋eb绔彛
 management:
@@ -13,6 +13,4 @@
         context-path: /gis #web璁块棶涓婁笅鏂囪矾寰�
         context-parameters:
             #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
-            idSuffix: 1
-            #ConfigListener涓簲鐢�
-            #configFileNames: config-global.xml,config-demo.xml
+            idSuffix: ${pipIrr.gis.idSuffix}

--
Gitblit v1.8.0