6 Commits (a6fbbc7172f1b1160754bf76367a2989169304f5)

Author SHA1 Message Date
YunaiV c916b30fa1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
 Conflicts:
	sql/ruoyi-vue-pro.sql
	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
	yudao-user-server/src/main/resources/application-local.yaml
4 years ago
YunaiV 098c5b4723 1. 管理后台,增加租户管理
2. 修复大量因为租户报错的单元测试
4 years ago
YunaiV 6265e4a736 支付的 code review 5 years ago
ouyang 461c6a0007 tina提交支付宝扫码支付 5 years ago
YunaiV ab19228ca6 完成支付的下单和提交订单的逻辑 5 years ago
YunaiV 6dc65234ef 增加支付相关表的 SQL,调整相关的实体 5 years ago