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

# Conflicts: # yudao-admin-server/src/test/resources/sql/create_tables.sql
2021-12-21 17:02:15 +08:00
parent d1a20bf259 be0b47ecb7
commit aad85337ce
806 changed files with 64521 additions and 2406 deletions
--- a/yudao-admin-server/src/test/resources/sql/clean.sql
+++ b/yudao-admin-server/src/test/resources/sql/clean.sql
@@ -24,6 +24,7 @@ DELETE FROM "sys_sms_template";
 DELETE FROM "sys_sms_log";
 DELETE FROM "sys_error_code";
 DELETE FROM "sys_social_user";
+DELETE FROM "sys_tenant";

 -- pay 开头的 DB
 DELETE FROM pay_merchant;