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 |    2 +-
 1 files changed, 1 insertions(+), 1 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 67e62cf..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
@@ -13,6 +13,7 @@
   configuration:
     map-underscore-to-camel-case: false
 
+
 ######搴旂敤鍩烘湰閰嶇疆
 #app:
 #  name: web
@@ -74,4 +75,3 @@
 #  #MPM鏋氫妇鍊煎睘鎬ф槧灏�
 #  mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
 
-

--
Gitblit v1.10.0