Merge pull request #1949 in CORE/base-third from feature/10.0 to feature/x

* commit '5ca461646bdd64b5c74ba81df6fccbfdc82df6c8':
  REPORT-47068 【定时调度】定时调度数据有误，定时调度传参数是正常的，报表计算出问题了
  DEC-17331 fix: 裁掉spring对jackson的部分支持

fine-spring/readme.md

@@ -1,3 +1,4 @@
-1 spring版本4.3.29.RELEASE
+1 spring版本4.3.29.RELEASE<br>
-2 fine-spring内容见https://kms.fineres.com/pages/viewpage.action?pageId=152798513
+2 fine-spring内容见https://kms.fineres.com/pages/viewpage.action?pageId=152798513<br>
-3 定制内容处均有"// 定制"注释
+3 定制内容处均有"// 定制"注释<br>
+4 去除对jackson的ObjectMapper的支持：DEC-17331<br>

fine-spring/src/main/java/com/fr/third/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

@@ -40,11 +40,11 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 			ClassUtils.isPresent("javax.xml.bind.Binder",
 					AllEncompassingFormHttpMessageConverter.class.getClassLoader());
 
-	private static final boolean jackson2Present =
+	private static final boolean jackson2Present = false;
-			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
+//			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
-					AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
+//					AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
-			ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
+//			ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
-					AllEncompassingFormHttpMessageConverter.class.getClassLoader());
+//					AllEncompassingFormHttpMessageConverter.class.getClassLoader());
 
 	private static final boolean jackson2XmlPresent =
 			ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper",