Merge remote-tracking branch 'origin/meiteng' into meiteng

d86d6d20 · luzhuang · 33824915 · c3941d9a · d86d6d20
Commit d86d6d20 authored Sep 20, 2019 by luzhuang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

application-dev.yml src/main/resources/application-dev.yml +1 -2

No files found.
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,6 +5,7 @@ server:
  servlet:
    context-path: /
    #uri-encoding: UTF-8
+  type: dev1

 #logging:
 #  level:
@@ -112,8 +113,6 @@ libreoffice:
  port: 10188
 mt:
  api: http://221.239.114.20:6789/api/
-server:
-  type: dev1

 eureka:
  instance: