lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,095 Commits 2 Branches 0 Tags 165 MiB
876fc07c55
Commit Graph

6095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
 2023-12-30 10:31:39 +08:00
YunaiV
078ead536b 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
YunaiV
be0e0f5d71 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-30 09:38:13 +08:00
YunaiV
9a03f1a796 🐛 BPM：多租户的工作流隔离 2023-12-30 09:38:01 +08:00
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
YunaiV
33c3686bef ✨ MALL：合并订单和售后订单的数量接口 2023-12-28 23:15:25 +08:00
YunaiV
1f3f3d789b ✨ MALL：营销文章增加 title 查询，简易解决常见问题、用户协议的编辑 2023-12-27 22:07:54 +08:00
YunaiV
c019136f07 ✨ Member：增加积分记录的时间筛选 2023-12-27 20:39:14 +08:00
ccran
a1ee0991f1 fix:文件路径url中文解码 2023-12-27 12:52:49 +08:00
puhui999
e5377074d5 数据权限：完善 code review 提到的问题 2023-12-26 00:21:04 +08:00
puhui999
6950368991 操作日志：完善 code review 提到的问题 2023-12-26 00:04:20 +08:00
YunaiV
2f5afdb5c9 ✨ Member：增加使用微信小程序 code 绑定手机号 2023-12-25 23:33:50 +08:00
YunaiV
5de6a8bd23 📖 code review：操作日志的实现 2023-12-25 21:40:16 +08:00
YunaiV
82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 08:43:38 +08:00
YunaiV
7542b6a78d ✨ Member：完善微信相关配置 2023-12-25 08:43:32 +08:00
芋道源码
525d41bad1
!805 重构操作日志记录实现；CRM-数据权限：完善数据权限补全管理员和公海相关情况处理逻辑 
Merge pull request !805 from puhui999/develop
 2023-12-25 00:42:51 +00:00
puhui999
7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop 2023-12-24 00:32:47 +08:00
puhui999
60e684c455 营销活动：获取商品近期参与的每个活动新增满减送和限时折扣活动 2023-12-24 00:32:17 +08:00
YunaiV
bd5c7d57dc ✨ Member：社交（三方）绑定接口，增加 openid 返回 2023-12-23 22:54:20 +08:00
YunaiV
7b482f5729 ✨ Member：增加获取单个社交用户的接口 2023-12-23 21:48:33 +08:00
puhui999
e8ade5f1fe crm：完善一些遗留的 TODO 2023-12-23 20:10:40 +08:00
YunaiV
59752d43b7 ✨ Member：修复社交登录时，自动创建 user 后，未进行绑定的问题 2023-12-23 17:54:13 +08:00
YunaiV
d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
YunaiV
106c1ecf4c 📖 code review：店铺装修逻辑 2023-12-19 23:11:09 +08:00
owen
0944584029 商品：用户未登录时，不记录商品浏览记录 2023-12-19 21:44:04 +08:00
puhui999
a05d3bc1d1 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-19 18:44:34 +08:00