Merge remote-tracking branch 'xbx/dev' into dev

# Conflicts:
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
This commit is contained in:
huanghui 2023-11-18 18:09:32 +08:00
commit 143516d671
1 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
server:
port: 8888
port: 8088
tomcat:
max-swallow-size: -1
error:
@ -149,7 +149,7 @@ spring:
password: aB3cDeF9
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml, classpath*:rms/**/xml/*Mapper.xml
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false