Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/resources/application.yml

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
   # 环境 dev/dev1|test|prod
   profiles:
-    active: test
+    active: dev1
   # jackson时间格式化
   jackson:
     time-zone: GMT+8
@@ -75,7 +75,7 @@ renren:
     header: token
 
 
-spring.jackson.serialization.FAIL_ON_EMPTY_BEANS: false
+#spring.jackson.serialization.FAIL_ON_EMPTY_BEANS: false
 
 express:
   sender: