From d2fc819dc069c7b8d338ae52a90a7f38704fac08 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application(233服务器).yml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
index 50d9255..a24b0b5 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050233\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,4 +1,3 @@
spring:
profiles:
- #233鏈嶅姟鍣細common-web, global, database, database-ym, database-sp, database-test,database-mj, self
include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self
--
Gitblit v1.8.0