5881 Commits (761ab8a0e565e565565d1ccdad6ffc79f5fafe09)
 

Author SHA1 Message Date
芋道源码 761ab8a0e5
!809 修复BUG, 会员当前有等级的时候下订单会把当前等级给清空了。
Merge pull request !809 from 云扬四海/fix-member-level-bug-0102
2 years ago
芋道源码 d728c36c1e
!811 修复订单操作日志中快递公司名称模板与数据对不上的问题
Merge pull request !811 from 杨宇庆/N/A
2 years ago
YunaiV 3091a0882f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV ee250c74d6 MALL:更新 uni-app + Vue3 实现 2 years ago
杨宇庆 9e895c8af1
修复订单操作日志中快递公司名称模板与数据对不上的问题
cn.iocoder.yudao.module.trade.enums.order.TradeOrderOperateTypeEnum中ADMIN_DELIVERY为deliveryName

Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2 years ago
yunlongn 39d26cc84d 会员当前有等级的时候下订单会把当前等级清空得bug修复 2 years ago
YunaiV 6c0978407b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2 years ago
YunaiV 8a947990f4 🐛 升级 easyexcel 依赖,解决 JDK21 导出报错 2 years ago
YunaiV a98d00a7fe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 2fb36563ec 🐛 修复 CacheUtils 异步缓存的 ThreadLocal 变量传递 2 years ago
YunaiV 81c726542b Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 51968c4c19 🐛 腾讯云上传 bug 2 years ago
YunaiV e35b8c45a0 🐛 REPORT:支持 SaaS 租户模式 2 years ago
YunaiV baabebb5d1 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
#	yudao-server/src/main/resources/application-dev.yaml
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
YunaiV 078ead536b 🐛 REPORT:支持 SaaS 租户模式 2 years ago
YunaiV be0e0f5d71 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 9a03f1a796 🐛 BPM:多租户的工作流隔离 2 years ago
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
2 years ago
YunaiV c48e0b9f48 Merge remote-tracking branch 'origin/master' 2 years ago
芋道源码 b5e19c63f7
!799 解决审批流自定义脚本无法获取流程变量
Merge pull request !799 from xiuuuu/master-jdk21
2 years ago
YunaiV c38790655f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV d31a12aff7 🐛 修改了支付 demo 退款单匹配错误问题 2 years ago
芋道源码 8dc56cc3f5
!800 修改了支付demo退款单匹配错误问题
Merge pull request !800 from lynfgn/master
2 years ago
芋道源码 53a64272b9
!804 代码生成器Vue2,Excel导出下载修复
Merge pull request !804 from virtuecai/master
2 years ago
YunaiV b0857aedbc 🐛 修复 ExcelUtils 报错 2 years ago
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
2 years ago
YunaiV 8de2eea1f7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV ed1b55fed7 🐛 文件路径 url 中文解码问题 2 years ago
芋道源码 b1be080e2f
!807 文件路径url中文解码问题
Merge pull request !807 from ccran/master
2 years ago
YunaiV 6d5fe962b7 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 0f6f204320 🐛 修改 `pay` 模块>支付订单的同步 Job,查询指定创建时间前的待支付订单 2 years ago
芋道源码 06977644ce
!808 修改`pay 模块>支付订单的同步 Job,查询指定创建时间前的待支付订单
Merge pull request !808 from 骑士梦/qs
2 years ago
YunaiV ff162e9c6c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 475e932aec 🐛 导出 Excel:Long 类型 ID 会丢失精度 2 years ago
wy 039a2b1278 支付订单的同步 Job,查询指定创建时间前的待支付订单 2 years ago
YunaiV 29405b9e41 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 0861372755 🐛 修复修改短信渠道缓存没有更新 2 years ago
YunaiV bc93325b9e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
2 years ago
YunaiV 829965e50a 🐛 fix(websocket): 修复 websocket 失效的问题 2 years ago
YunaiV 46e60d6b0a Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV 08ff391f78 🐛 Websocket 断开时,未删除会话缓存 bug 2 years ago
ccran a1ee0991f1 fix:文件路径url中文解码 2 years ago
芋道源码 46f929ee8c
!792 修复代码生成模板文件中import的错误
Merge pull request !792 from 云开/fix-vm
2 years ago
芋道源码 1bdb389c89
!793 增加 东莞市下面的行政区信息
Merge pull request !793 from 风狗/N/A
2 years ago
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>
2 years ago
lynfgn 8298896efd
修改了退款单号匹配错误问题
修改了退款单号匹配错误问题

Signed-off-by: lynfgn <707557870@qq.com>
2 years ago
Qiksy 35f796875d fix 审批流-自定义规则脚本无法获取到流程变量(Process Variables) 2 years ago
YunaiV 1e5b0a1c0d Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV a7189e7425 考虑到大家的接受度,master 还是保持 jdk8 版本(稳定),master-jdk21 使用 jdk21 版本(创新) 2 years ago
YunaiV ff00748d11 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago