提交merge1.3
This commit is contained in:
@@ -49,7 +49,11 @@ spring:
|
||||
# 国际化资源文件路径
|
||||
basename: i18n/messages
|
||||
profiles:
|
||||
<<<<<<< HEAD
|
||||
active: dev
|
||||
=======
|
||||
active: prod # (天翼云)cloud (本地测试)test (本地)local (生产)prod (农大)
|
||||
>>>>>>> v1.3
|
||||
# 文件上传
|
||||
servlet:
|
||||
multipart:
|
||||
|
||||
Reference in New Issue
Block a user