Merge remote-tracking branch 'origin/master'

ldt-core/src/main/resources/application-dev.yml

@@ -17,11 +17,11 @@ spring:
     #  commandTimeout: 5000
   datasource:
     # MySql
-#    url: jdbc:mysql://192.168.1.168:3306/ldt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    url: jdbc:mysql://192.168.1.218:3306/gx-ldt-0823?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.1.168:3306/ldt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://192.168.1.218:3306/gx-ldt-0823?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root@123456
-#    password: root
+#    password: root@123456
+    password: root
 
     # PostgreSQL
     #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot

ldt-core/src/main/resources/application.yml

@@ -250,6 +250,8 @@ blade:
     exclude-tables:
       - blade_user
       - blade_dict_biz
+      - ldt_activity
+      - ldt_join_record