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 2860108a7d 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/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
5 years ago
..
bpm 实现 OA 请假的取消申请 5 years ago
infra 流程的挂起与激活 5 years ago
pay 优化 支付配置校验方式,优化业务层异常抛出类型,优化支付应用渲染逻辑,添加删除支付商户 支付应用的校验,退款订单去除reqNo字段,支付订单去除 channelExtras 参数展示 5 years ago
system 【修改】修改部门负责人,从 String 字符串,调整成和后台用户的用户编号绑定 5 years ago
tool 项目结构调整 x 11 : 修改前端项目为 yudao-admin-ui 5 years ago
login.js 前端接入绑定社交平台的逻辑 5 years ago
menu.js 项目结构调整 x 11 : 修改前端项目为 yudao-admin-ui 5 years ago