From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml
index 26ee9bb..26fed91 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml
@@ -12,8 +12,13 @@
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
+ #闆嗗洟闆嗘垚閰嶇疆淇℃伅
docking:
apply:
+ #闆嗗洟鎻愪緵鐨勬帴鍙ｅ湴鍧�
jtInterUrl: http://116.205.176.185:8099
- unitCode: 410-MDM
+ #绯荤粺鍘傚鍗曚綅浠ｇ爜
+ unitCode: 131460
+ #绯荤粺鏍囪瘑
+ sysName: 410-MDM
--
Gitblit v1.9.3