From 11307b25b3898578cd5867751c1dbfaa7300f148 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 25 七月 2024 15:19:07 +0800
Subject: [PATCH] 解决冲突恢复代码

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 7b4214b..cf03082 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -130,6 +130,16 @@
 #    ym: 100
 #    pj: 101
 
+#椤圭洰閰嶇疆
+project:
+    #椤圭洰缂栫爜
+    projectNo: 10
+    #鎺у埗鍣ㄧ被鍨�
+    controllerType: 57
+    #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
+    divisionCode: 120114403100
+
+
 #閫氳鍗忚
 #protocol: DYJS_2023,DYJS_2024
 mw:

--
Gitblit v1.8.0