YunaiV
|
31ab86dbeb
|
【同步】jdk21 和 jdk8 的代码
|
2024-11-25 19:35:57 +08:00 |
|
YunaiV
|
bbb1bec1b9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApiImpl.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
|
2024-11-25 19:32:10 +08:00 |
|
芋道源码
|
df4cc6667d
|
!1134 同步商城的客服优化、门店自提优化
Merge pull request !1134 from 芋道源码/develop
|
2024-11-25 11:31:50 +00:00 |
|
YunaiV
|
87cee4628a
|
【代码优化】商城：优化分销提现的逻辑（余额）
|
2024-11-25 19:30:55 +08:00 |
Lesan
|
98b2e41414
|
feat: bpm设计器适配Simple设计器，操作按钮
|
2024-11-25 06:19:37 +00:00 |
|
Lesan
|
ca6121b205
|
fix: 会签情况下,存在未完成的审批却显示已完成
|
2024-11-25 01:57:05 +00:00 |
|
Lesan
|
0dcac3044a
|
Merge branch 'feature/bpm' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/bpm
|
2024-11-25 01:55:51 +00:00 |
|
Lesan
|
0dc22b129a
|
fix: 会签情况下,存在未完成的审批却显示已完成
|
2024-11-25 01:50:58 +00:00 |
|
YunaiV
|
b8d26f83f2
|
README：增加工作流的演示图片
|
2024-11-23 10:24:21 +08:00 |
|
YunaiV
|
9da052a45a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmFormFieldsPermissionReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-11-23 10:17:42 +08:00 |
|
YunaiV
|
0552f86018
|
README：增加工作流的演示图片
|
2024-11-23 10:16:56 +08:00 |
|
芋道源码
|
62379641fa
|
!1133 bpm 仿钉钉/飞书模式
Merge pull request !1133 from 芋道源码/feature/bpm
|
2024-11-23 02:14:34 +00:00 |
|
YunaiV
|
c616066a60
|
README：增加工作流的演示图片
|
2024-11-23 10:08:19 +08:00 |
|
YunaiV
|
5b34e0bd51
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# sql/mysql/bpm_update.sql
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java
|
2024-11-22 20:41:00 +08:00 |
|
YunaiV
|
4d4df7bd0c
|
【代码优化】websocket：找不到 session 时，日志级别从 info 到 debug 级别
|
2024-11-22 20:33:31 +08:00 |
|
YunaiV
|
4a23872598
|
【代码优化】工作流：优化 form 分配人的逻辑
|
2024-11-19 21:04:08 +08:00 |
|
YunaiV
|
396051b41e
|
【代码合并】商城：合并最新的 master-jdk17 分支
|
2024-11-19 09:30:40 +08:00 |
|
YunaiV
|
c239d9cc56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
|
2024-11-19 09:26:44 +08:00 |
|
芋道源码
|
b48842091c
|
!1129 解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Merge pull request !1129 from 杨宇庆/N/A
|
2024-11-19 01:09:01 +00:00 |
|
芋道源码
|
053fe9c7a8
|
!1130 【功能完善】商城：客服消息查询 pageSize 改 limit
Merge pull request !1130 from puhui999/develop2
|
2024-11-19 01:05:53 +00:00 |
puhui999
|
c501172694
|
【功能完善】商城：客服消息查询 pageSize 改 limit
|
2024-11-18 17:20:46 +08:00 |
杨宇庆
|
f782e3a9af
|
解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-11-18 08:06:52 +00:00 |
jason
|
b629e0a615
|
【功能新增】 增加审批人分配策略：表单内的部门负责人
|
2024-11-18 08:23:58 +08:00 |
|
jason
|
61c9a04f9f
|
【功能修复】 修复表单内用户字段可以多选时的问题
|
2024-11-17 23:58:23 +08:00 |
|
jason
|
7886aaf244
|
【功能修改】 创建流程时，增加流程变量发起人 ID
|
2024-11-17 16:40:45 +08:00 |
|
jason
|
0c06a1596e
|
【功能新增】 增加审批人分配策略：选择表单内成员
|
2024-11-17 10:41:10 +08:00 |
|
YunaiV
|
36faf88d49
|
【代码优化】商城：补全 AppProductBrowseHistoryRespVO 注解
|
2024-11-10 18:48:40 +08:00 |
|
芋道源码
|
2775dbbad1
|
!1126 【功能完善】商城: 客服
Merge pull request !1126 from puhui999/develop
|
2024-11-10 10:36:32 +00:00 |
|
puhui999
|
43cb8b1f21
|
【功能完善】商城: 客服
|
2024-11-10 18:01:58 +08:00 |
|
YunaiV
|
4cf82ba24b
|
【功能修改】工作流：流程详情，每个 node 节点，都返回 candidateStrategy 字段
|
2024-11-10 11:43:57 +08:00 |
|
YunaiV
|
e2f046d7a9
|
【功能修复】工作流：BPMN 发起自选时，因为没有 ServiceTask 导致报错
|
2024-11-10 11:36:00 +08:00 |
|
jason
|
2808297bfe
|
【功能优化】 删除多余的 import
|
2024-11-10 09:08:03 +08:00 |
|
jason
|
8d1e9cf988
|
Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
|
2024-11-10 09:05:50 +08:00 |
|
jason
|
396433386c
|
【功能优化】 流程发起人，展示抄送节点，用于选择抄送人
|
2024-11-10 09:05:14 +08:00 |
|
YunaiV
|
e46163cba7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-11-09 18:38:24 +08:00 |
|
YunaiV
|
0bbc682ba4
|
【代码优化】infra：s3 minio sdk 替换为 aws sdk
|
2024-11-09 18:33:52 +08:00 |
|
puhui999
|
6695aeeb8f
|
【功能完善】商城: 客服
|
2024-11-09 17:35:35 +08:00 |
|
YunaiV
|
e1ffb2e911
|
Merge branch 'master-jdk17-updateS3ToAws' of https://gitee.com/radio-devil/ruoyi-vue-pro into master-jdk17
|
2024-11-09 15:39:42 +08:00 |
|
芋道源码
|
e7ef83db7a
|
!1113 【新增功能】微信转账到零钱：主动查询转账状态
Merge pull request !1113 from 杨宇庆/N/A
|
2024-11-09 07:33:09 +00:00 |
|
芋道源码
|
717549691a
|
!1119 【修复】错误日志表中user_id字段类型不匹配
Merge pull request !1119 from 杨宇庆/N/A
|
2024-11-09 07:32:32 +00:00 |
|
芋道源码
|
b93199bd0a
|
!1124 【修复】修复会员取消售后接口中未校验用户ID的漏洞
Merge pull request !1124 from 杨宇庆/N/A
|
2024-11-09 07:29:00 +00:00 |
|
YunaiV
|
14dc2e3849
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2024-11-09 15:11:28 +08:00 |
|
芋道源码
|
9f4e94deb1
|
Merge pull request #694 from shanaiardor/fix/tenantjob-aspect-voidretuenfail
修复由于多租户定时任务方法返回 void 导致的 xxlJob 任务执行失败的问题
|
2024-11-09 15:10:58 +08:00 |
|
杨宇庆
|
c776371d48
|
【修复】修复会员取消退款接口中未校验用户ID的漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-11-06 15:21:25 +00:00 |
wct
|
72d2d81d6a
|
修复由于多租户定时任务方法返回 void 导致的执行 xxlJob 执行失败的问题
|
2024-11-06 17:32:35 +08:00 |
|
YunaiV
|
71bc5d56f1
|
【代码评审】商城：消息获取改为游标查询
|
2024-11-05 20:37:25 +08:00 |
|
芋道源码
|
6f762f21d3
|
!1120 【功能优化】商城
Merge pull request !1120 from puhui999/develop
|
2024-11-05 12:35:05 +00:00 |
|
puhui999
|
4057c74afd
|
【功能优化】商城: 积分商城活动排序
|
2024-11-05 16:15:29 +08:00 |
|
puhui999
|
1285acc49e
|
【功能优化】商城: 虚拟成团创建团成员时设置团长 ID
|
2024-11-05 15:36:32 +08:00 |
|
puhui999
|
a2e9eccee7
|
【功能完善】商城: 客服消息
|
2024-11-05 15:21:02 +08:00 |