ady/ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

Browse Source 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java
	yudao-admin-server/src/main/resources/application-local.yaml
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
This commit is contained in:
YunaiV
2022-01-23 04:12:34 +08:00
parent 19b574fd4b c612133f22
commit 2860108a7d
547 changed files with 34242 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-admin-server/src/test/resources/sql/clean.sql
View File

@@ -31,4 +31,7 @@ DELETE FROM pay_merchant;
DELETE FROM pay_app;
DELETE FROM pay_channel;
DELETE FROM pay_order;
DELETE FROM pay_refund;
DELETE FROM pay_refund;
-- bpm 开头的 DB
DELETE FROM "bpm_form";