Merge remote-tracking branch 'origin/5.2' into 5.2

src/main/resources/application.yml

@@ -87,7 +87,7 @@ spring:
 mybatis-plus:
   global-config:
     db-config:
-      column-format: "\"%s\""
+      column-format: "\"%s\"" #增加这个需要增加 ms-db
       id-type: assign_id
   configuration:
     database-id: mysql