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-code/src/main/resources/application-dev.yml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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..0c94ec2 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
@@ -1,17 +1,30 @@
#鏈嶅姟鍣ㄧ鍙�
server:
port: 36014
-
+ tomcat:
+ uri-encoding: UTF-8
+ servlet:
+ encoding:
+ enabled: true
+ charset: UTF-8
+ force: true
#鏁版嵁婧愰厤缃�
spring:
datasource:
url: ${ubcs.datasource.mdm.dev.url}
username: ${ubcs.datasource.mdm.dev.username}
password: ${ubcs.datasource.mdm.dev.password}
+ messages:
+ encoding: utf-8
+ basename: i18n/messages
#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
+
+
+#mybatis-plus-join:
+# table-alias: t
######搴旂敤鍩烘湰閰嶇疆
#app:
@@ -73,5 +86,4 @@
# system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
# #MPM鏋氫妇鍊煎睘鎬ф槧灏�
# mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
-
--
Gitblit v1.9.3