You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
..
pay-app-menu.sql 完成支付模块支付应用信息和微信类型的支付渠道配置。 4 years ago
pay-dict.sql 1:优化商户管理页面BUG 4 years ago
pay-merchant-menu.sql 完成支付模块支付应用信息和微信类型的支付渠道配置。 4 years ago
pay-order-menu.sql 1:优化商户管理页面BUG 4 years ago
pay_refund.sql 支付退款申请,支付宝手机wap 相应实现 4 years ago
quartz.sql code review 工作流的代码 4 years ago
ruoyi-vue-pro.sql 修复引入多租户后,前端 <img /> 读取图片报错的问题 4 years ago