YunaiV
|
6b79058417
|
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
|
2024-03-30 18:03:14 +08:00 |
|
YunaiV
|
81bcf718cd
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:25 +08:00 |
|
YunaiV
|
0917b621e6
|
BPM：解决租户关闭时，Flowable 查询会报错的问题
|
2024-03-30 18:02:12 +08:00 |
|
YunaiV
|
f265762f22
|
修复 jdk8版本下docker-compose中Redis Host参数名称不正确的问题
|
2024-03-30 17:44:24 +08:00 |
|
YunaiV
|
3b7a1b55b9
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:43:31 +08:00 |
|
芋道源码
|
59a63911fb
|
!901 修复 jdk21版本下docker-compose中Redis Host参数名称不正确的问题
Merge pull request !901 from E1/master-jdk21
|
2024-03-30 09:43:05 +00:00 |
|
YunaiV
|
c943233ee5
|
bugfix：修复 Xss 开启时，忽略的 URL 针对 RequestBody 还是会 XSS 过滤的问题
|
2024-03-30 17:39:56 +08:00 |
|
YunaiV
|
e48240a192
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-30 17:09:26 +08:00 |
|
YunaiV
|
6cf7e60893
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
|
2024-03-30 17:09:14 +08:00 |
|
芋道源码
|
c3184d70ac
|
Merge pull request #462 from cheng102e/fix/issue-401
fix: [issue-401]修复中山市
|
2024-03-30 17:07:51 +08:00 |
|
YunaiV
|
d636391a50
|
bugfix：修复中山市缺少
|
2024-03-30 17:07:36 +08:00 |
|
YunaiV
|
a68abc43ae
|
CRM：修复 @RequestBody 和 Multipart 不能同时存在的异常和导入客户后序列化产生的异常
|
2024-03-30 17:06:13 +08:00 |
|
YunaiV
|
ba50e62af9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 17:00:16 +08:00 |
|
YunaiV
|
c78519c6aa
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java
|
2024-03-30 16:59:46 +08:00 |
|
YunaiV
|
544d9030e6
|
pay：后台支付应用信息列表关闭某一渠道，但是任然显示为开启状态
|
2024-03-30 16:59:05 +08:00 |
|
jiejc1
|
7d26d63dba
|
fix: [issue-401]修复中山市
|
2024-03-28 20:06:31 +08:00 |
|
芋道源码
|
9b85a9617d
|
!915 添加加入购物车商品数量不可为0或更低数量的限制
Merge pull request !915 from 风狗/N/A
|
2024-03-28 10:58:24 +00:00 |
|
芋道源码
|
6c12e68a0a
|
!908 解决查看未上架的商品时，报错缺少商品名称问题
Merge pull request !908 from 杨宇庆/N/A
|
2024-03-28 10:55:59 +00:00 |
|
芋道源码
|
830485911b
|
!924 取消订单同步取消分销问题
Merge pull request !924 from wangxiaorui/N/A
|
2024-03-28 10:53:06 +00:00 |
|
芋道源码
|
0bd4fbfe52
|
!920 发货日志物流公司名称不显示问题
Merge pull request !920 from 山野羡民/master
|
2024-03-28 10:51:28 +00:00 |
|
芋道源码
|
20f8470b55
|
!922 修复ERP采购订单菜单权限错误问题
Merge pull request !922 from zengheng/erp-dev
|
2024-03-28 10:48:25 +00:00 |
|
YunaiV
|
f623156829
|
README：增加功能图，方便理解
|
2024-03-27 21:11:12 +08:00 |
|
YunaiV
|
2275f97e36
|
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/framework/flowable/core/candidate/expression/BpmTaskAssignStartUserExpression.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
|
2024-03-27 21:08:26 +08:00 |
|
YunaiV
|
ba541fba83
|
README：增加功能图，方便理解
|
2024-03-27 21:06:06 +08:00 |
|
YunaiV
|
ec1ce2f358
|
README：增加功能图，方便理解
|
2024-03-27 21:05:13 +08:00 |
|
YunaiV
|
aea8fb7fc6
|
BPM：完善相关的代码注释
|
2024-03-27 19:49:06 +08:00 |
|
YunaiV
|
62de6c36bc
|
BPM：完善相关的代码注释
|
2024-03-27 19:42:08 +08:00 |
|
wangxiaorui
|
85f994f643
|
取消订单同步取消分销问题
创建分销单的时候是按照OrderItem的主键来创建，取消的时候应该按照OrderItem的主键来取消，否则会导致无法取消分销单
Signed-off-by: wangxiaorui <742397974@qq.com>
|
2024-03-26 01:19:48 +00:00 |
|
YunaiV
|
3b8dee4963
|
BPM：完善相关的代码注释
|
2024-03-26 08:38:59 +08:00 |
|
YunaiV
|
f3e8c0971f
|
Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
|
2024-03-24 10:45:41 +08:00 |
|
YunaiV
|
a79985ae5b
|
工作流最新版本，支持 JDK8 分支
|
2024-03-24 10:44:54 +08:00 |
|
YunaiV
|
ff8fdaaacc
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-03-24 10:44:35 +08:00 |
|
YunaiV
|
b11231c499
|
Merge remote-tracking branch 'origin/master'
|
2024-03-24 10:44:08 +08:00 |
|
YunaiV
|
cc27652f86
|
最新菜单 SQL 的同步
|
2024-03-24 10:43:37 +08:00 |
|
YunaiV
|
18f6bdd1c0
|
最新菜单 SQL 的同步
|
2024-03-24 10:41:54 +08:00 |
|
YunaiV
|
c6e5cfccc9
|
Merge branch 'feature/bpm' 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/candidate/vo/BpmTaskCandidateRuleVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
# 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/definition/BpmProcessDefinitionController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.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/BpmProcessInstanceCopyCreateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.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/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/handler/MultiInstanceHandler.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChain.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateAdminUserApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateDeptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidatePostApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateRoleApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateScriptApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/sourceInfoProcessor/BpmCandidateUserGroupApiSourceInfoProcessor.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.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/definition/BpmTaskAssignRuleService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/cc/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfoProcessorChainTest.java
# yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java
|
2024-03-24 10:16:24 +08:00 |
|
YunaiV
|
5c5bd0e5da
|
BPM：流程模型的 icon 维护
|
2024-03-24 10:08:51 +08:00 |
|
YunaiV
|
727faac8d8
|
BPM：增加流程表达式的管理
|
2024-03-23 21:11:53 +08:00 |
|
YunaiV
|
6d44bf0d7a
|
BPM：增加任务监听器、执行监听器的管理
|
2024-03-23 19:23:11 +08:00 |
|
YunaiV
|
889b9406b8
|
BPM：增加任务监听器、执行监听器的管理
|
2024-03-23 15:58:45 +08:00 |
|
zengheng
|
a541762697
|
修复erp采购管理采购订单菜单权限错误的bug
|
2024-03-23 10:57:58 +08:00 |
|
liyujiang
|
53f2d4cfd1
|
fix(trade): 发货日志无需发货时的描述改为“已发货，快递公司：无，快递单号：无”
|
2024-03-23 10:16:47 +08:00 |
|
YunaiV
|
528a321f0a
|
BPM：增加「发起人自选」的任务审批人的分配策略
|
2024-03-23 00:54:26 +08:00 |
|
YunaiV
|
acea73c991
|
BPM：新增【流程任务】菜单，用于全部流程实例的查询
|
2024-03-22 09:06:52 +08:00 |
|
YunaiV
|
ba4b3701bf
|
BPM：新增【流程实例】菜单，用于全部流程实例的查询
|
2024-03-22 08:26:19 +08:00 |
|
liyujiang
|
03e3dc0121
|
fix(pay):后台支付应用信息列表关闭某一渠道，但是任然显示为开启状态
|
2024-03-22 08:19:53 +08:00 |
|
liyujiang
|
10bfbc9e6e
|
fix(trade): 发货日志物流公司名称不显示问题，参见 TradeOrderUpdateServiceImpl 类中调用TradeOrderLogUtils.setOrderInfo传递的参数“expressName”
|
2024-03-21 18:07:12 +08:00 |
|
YunaiV
|
b21eac6ca6
|
优化 findAndThen 方法，支持 key 为 null 的过滤
|
2024-03-21 08:53:16 +08:00 |
|
YunaiV
|
e5444c5d47
|
BPM：优化 convert 的逻辑
|
2024-03-20 21:32:01 +08:00 |
|
YunaiV
|
c104191821
|
BPM：增强 model 流程模型部署时，各种参数校验
|
2024-03-20 18:51:36 +08:00 |
|