Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

pluss-manage-page/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
     include: common, ryx, ys
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB
@@ -26,9 +26,16 @@ spring:
     scheduling:
       pool:
         size: 10
+  freemarker:
+    template-loader-path: classpath:/temp
+    allow-request-override: false
+    charset: utf-8
+    content-type: text/html
+    expose-request-attributes: true
 
 server:
   port: 8083
   compression:
     enabled: true
     mime-types: application/json
+