Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -60,6 +60,12 @@ spring:
     # 国际化资源文件路径
     basename: static/i18n/messages
   jackson:
+    serialization:
+      # 某些类对象无法序列化的时候，是否报错
+      fail_on_empty_beans: true
+    deserialization:
+      # json对象中有不存在的属性时候，是否报错
+      fail_on_unknown_properties: true
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
     #配置读取的多环境读取