Merge remote-tracking branch 'github/3.0' into 3.0

build.gradle

@@ -23,7 +23,7 @@ ext {
         mybatisVersion = '3.5.4',
         mybatisSpringVersion = '2.0.3',
         mybatisSpringBootStarterVersion = '2.1.1',
-        springVersion = '5.2.3.RELEASE',
+        springVersion = '5.2.4.RELEASE',
         springBootVersion = '2.2.4.RELEASE',
         jsqlparserVersion = '3.1',
         junitVersion = '5.6.0',