YunaiV
|
cd7da1b3a2
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderExtensionMapper.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
|
2023-12-29 23:51:51 +08:00 |
|
YunaiV
|
2ede505987
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2023-12-29 22:35:26 +08:00 |
|
YunaiV
|
c48e0b9f48
|
Merge remote-tracking branch 'origin/master'
|
2023-12-29 22:34:50 +08:00 |
|
芋道源码
|
b5e19c63f7
|
!799 解决审批流自定义脚本无法获取流程变量
Merge pull request !799 from xiuuuu/master-jdk21
|
2023-12-29 14:34:06 +00:00 |
|
YunaiV
|
c38790655f
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 22:33:40 +08:00 |
|
YunaiV
|
d31a12aff7
|
🐛 修改了支付 demo 退款单匹配错误问题
|
2023-12-29 22:33:26 +08:00 |
|
芋道源码
|
8dc56cc3f5
|
!800 修改了支付demo退款单匹配错误问题
Merge pull request !800 from lynfgn/master
|
2023-12-29 14:30:54 +00:00 |
|
芋道源码
|
53a64272b9
|
!804 代码生成器Vue2，Excel导出下载修复
Merge pull request !804 from virtuecai/master
|
2023-12-29 14:27:21 +00:00 |
|
YunaiV
|
b0857aedbc
|
🐛 修复 ExcelUtils 报错
|
2023-12-29 22:23:07 +08:00 |
|
YunaiV
|
f0fd0c6677
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
|
2023-12-29 22:21:45 +08:00 |
|
YunaiV
|
8de2eea1f7
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 22:21:11 +08:00 |
|
YunaiV
|
ed1b55fed7
|
🐛 文件路径 url 中文解码问题
|
2023-12-29 22:20:59 +08:00 |
|
芋道源码
|
b1be080e2f
|
!807 文件路径url中文解码问题
Merge pull request !807 from ccran/master
|
2023-12-29 14:19:48 +00:00 |
|
YunaiV
|
6d5fe962b7
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 21:53:03 +08:00 |
|
YunaiV
|
0f6f204320
|
🐛 修改 pay 模块>支付订单的同步 Job，查询指定创建时间前的待支付订单
|
2023-12-29 21:52:49 +08:00 |
|
芋道源码
|
06977644ce
|
!808 修改`pay 模块>支付订单的同步 Job，查询指定创建时间前的待支付订单
Merge pull request !808 from 骑士梦/qs
|
2023-12-29 13:50:18 +00:00 |
|
YunaiV
|
ff162e9c6c
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 21:45:55 +08:00 |
|
YunaiV
|
475e932aec
|
🐛 导出 Excel:Long 类型 ID 会丢失精度
|
2023-12-29 21:45:43 +08:00 |
|
wy
|
039a2b1278
|
支付订单的同步 Job，查询指定创建时间前的待支付订单
|
2023-12-29 16:47:28 +08:00 |
|
YunaiV
|
29405b9e41
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 12:59:31 +08:00 |
|
YunaiV
|
0861372755
|
🐛 修复修改短信渠道缓存没有更新
|
2023-12-29 12:59:20 +08:00 |
|
YunaiV
|
bc93325b9e
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
|
2023-12-29 12:55:11 +08:00 |
|
YunaiV
|
829965e50a
|
🐛 fix(websocket): 修复 websocket 失效的问题
|
2023-12-29 12:54:52 +08:00 |
|
YunaiV
|
46e60d6b0a
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-29 12:49:13 +08:00 |
|
YunaiV
|
08ff391f78
|
🐛 Websocket 断开时，未删除会话缓存 bug
|
2023-12-29 12:48:36 +08:00 |
|
ccran
|
a1ee0991f1
|
fix:文件路径url中文解码
|
2023-12-27 12:52:49 +08:00 |
|
芋道源码
|
46f929ee8c
|
!792 修复代码生成模板文件中import的错误
Merge pull request !792 from 云开/fix-vm
|
2023-12-19 04:29:18 +00:00 |
|
芋道源码
|
1bdb389c89
|
!793 增加 东莞市下面的行政区信息
Merge pull request !793 from 风狗/N/A
|
2023-12-19 04:27:25 +00:00 |
|
virtuecai
|
4cd36b2502
|
update yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm.
excel export download file bug fix
Signed-off-by: virtuecai <virtuecai@163.com>
|
2023-12-18 02:42:36 +00:00 |
|
lynfgn
|
8298896efd
|
修改了退款单号匹配错误问题
修改了退款单号匹配错误问题
Signed-off-by: lynfgn <707557870@qq.com>
|
2023-12-15 01:50:44 +00:00 |
|
Qiksy
|
35f796875d
|
fix 审批流-自定义规则脚本无法获取到流程变量（Process Variables）
|
2023-12-15 09:40:29 +08:00 |
|
YunaiV
|
840b7a42ba
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-12 12:40:07 +08:00 |
|
YunaiV
|
1e5b0a1c0d
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-12 12:21:55 +08:00 |
|
YunaiV
|
a7189e7425
|
✨ 考虑到大家的接受度，master 还是保持 jdk8 版本（稳定），master-jdk21 使用 jdk21 版本（创新）
|
2023-12-12 12:21:38 +08:00 |
|
YunaiV
|
ff00748d11
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2023-12-12 12:20:32 +08:00 |
|
YunaiV
|
d2c071bbb6
|
✨ 考虑到大家的接受度，master 还是保持 jdk8 版本（稳定），master-jdk21 使用 jdk21 版本（创新）
|
2023-12-12 12:17:50 +08:00 |
|
风狗
|
a6a9f4e3a6
|
增加 东莞市下面的行政区信息
Signed-off-by: 风狗 <909275705@qq.com>
|
2023-12-11 02:47:22 +00:00 |
|
kyle
|
6a8baff080
|
fix: 修复vm文件中，import依赖路径的错误
|
2023-12-11 09:28:43 +08:00 |
|
YunaiV
|
517f3bc187
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk8
|
2023-12-09 01:10:09 +08:00 |
|
YunaiV
|
8c67d1d0ba
|
✨ 增加《迁移功能到精简版》的说明地址
|
2023-12-09 01:05:25 +08:00 |
|
YunaiV
|
3806c8275f
|
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
|
2023-12-08 22:27:50 +08:00 |
|
YunaiV
|
fc9f46947e
|
🎉 精简仅保留 system、infra 功能，适合小项目
|
2023-12-08 22:27:38 +08:00 |
|
YunaiV
|
57b8411f03
|
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
|
2023-12-08 22:19:01 +08:00 |
|
YunaiV
|
72865b5ebb
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-08 22:17:52 +08:00 |
|
YunaiV
|
802ac89b73
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-08 22:17:52 +08:00 |
|
YunaiV
|
10d245afc3
|
🐛 移除多余的 yudao-spring-boot-starter-security 依赖
|
2023-12-08 22:17:13 +08:00 |
|
YunaiV
|
de9da10730
|
🎉 精简仅保留 system、infra 功能，适合小项目
|
2023-12-07 23:52:52 +08:00 |
|
YunaiV
|
8b80c9f415
|
Merge remote-tracking branch 'origin/master-jdk8' into master-jdk8
|
2023-12-07 23:23:03 +08:00 |
|
YunaiV
|
a0d72ffb00
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-07 23:22:46 +08:00 |
|
YunaiV
|
7e806c65dc
|
⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护
|
2023-12-07 23:21:23 +08:00 |
|