From 6cd820835b3e65076b7925ca9a698161a763f918 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:59:58 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 1096c57..7ea9a51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -12,10 +12,7 @@
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
-docking:
- apply:
- jtInterUrl: http://116.205.176.185:8099
- unitCode: 410-MDM
+
######搴旂敤鍩烘湰閰嶇疆
#app:
@@ -78,4 +75,3 @@
# #MPM鏋氫妇鍊煎睘鎬ф槧灏�
# mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
-
--
Gitblit v1.10.0