From a37271af0a5a2eb04ca23c80cca32567c968fa8e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 15:00:33 +0800
Subject: [PATCH] 解决git冲突

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   14 ++++++++++++++
 1 files changed, 14 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 6e0fed0..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:
@@ -149,3 +159,7 @@
         - /sso/sso
         - /remote/comRes/receive
         - /wx/comRes/receive
+#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
+auto-statistics:
+    startHour: 9 #寮�濮嬪皬鏃� 0
+    startMinute: 51 #寮�濮嬪垎閽� 5

--
Gitblit v1.8.0