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 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
3 years ago
..
bpm 回退-任务 4 years ago
infra 完善 Redis 缓存的查询 4 years ago
mall product:优化管理后台相关的接口 3 years ago
pay 多模块重构 12:修改项目名字,按照新的规则 4 years ago
system product:优化管理后台相关的接口 3 years ago
login.js refactor: verify 3 years ago
menu.js 进一步重构社交登陆的实现 4 years ago