xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
2023-01-04 10:48:18 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
xingyu4j
|
fea1ad8f8d
|
升级最新依赖
|
2022-12-02 11:37:36 +08:00 |
|
xingyu4j
|
a43b884c73
|
fix: warn
|
2022-11-30 10:30:58 +08:00 |
|
芋道源码
|
8c4ba396be
|
!309 fix:流程代办，日期时区转换错误
Merge pull request !309 from zy_2021/master
|
2022-11-29 14:17:35 +00:00 |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
2022-11-23 22:54:44 +08:00 |
|
zy
|
65ba4b6ae0
|
fix:claimTime 转换时也加时区设置，并进行非空判断
|
2022-11-21 13:34:22 +08:00 |
|
zy
|
ab164d93f0
|
fix:流程代办，日期时区转换错误
|
2022-11-21 10:15:06 +08:00 |
|
YunaiV
|
c5b547e0f3
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
2022-11-12 20:22:09 +08:00 |
|
芋道源码
|
62a6a993a8
|
!284 bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化"
Merge pull request !284 from SuperHao/N/A
|
2022-11-10 14:31:11 +00:00 |
|
YunaiV
|
d3b6a0ca69
|
1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
|
2022-11-10 12:55:26 +08:00 |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
2022-11-09 11:14:46 +08:00 |
|
SuperHao
|
26c728b050
|
bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化"
|
2022-10-28 09:04:41 +00:00 |
|
xingyu
|
9054a772b0
|
feat: 升级依赖
|
2022-09-20 18:00:43 +08:00 |
|
xingyu
|
91cf15fc26
|
fix: #I5KUUB
|
2022-08-09 09:33:34 +08:00 |
|
YunaiV
|
2866b58741
|
1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度
2. 完整移除 activiti 遗留的东东
|
2022-07-29 22:51:52 +08:00 |
|
YunaiV
|
62dc600c51
|
reactor：完善多租户的配置类
|
2022-07-27 09:08:56 +08:00 |
|
YunaiV
|
4fe3da058c
|
更新 README 文档
|
2022-07-25 00:19:32 +08:00 |
|
YunaiV
|
7ab0dfbe6e
|
完善 BPM 代码，补充工作流的视频教程
|
2022-07-23 21:43:19 +08:00 |
|
xingyu
|
f4217fe4d7
|
Merge remote-tracking branch 'origin/master'
|
2022-07-22 10:44:15 +08:00 |
|
xingyu
|
f84f3a3631
|
refactor: 时间区间查询传入数组-测试模块
|
2022-07-22 10:24:59 +08:00 |
|
芋道源码
|
26f684e945
|
!223 refactor: 时间区间查询传入数组
Merge pull request !223 from xingyu/master
|
2022-07-21 15:29:50 +00:00 |
|
xingyu
|
dad10d858a
|
refactor: 时间区间查询传入数组
|
2022-07-21 23:22:51 +08:00 |
|
YunaiV
|
c1e2e9032c
|
优化前端的依赖安装，使用 yarn 替代
|
2022-07-21 20:51:17 +08:00 |
|
YunaiV
|
907c7e763f
|
增加文档、视频教程的地址
|
2022-07-21 00:10:59 +08:00 |
|
YunaiV
|
b0cdfd7afc
|
完善工作流的注释
|
2022-07-20 00:34:44 +08:00 |
|
wzy
|
16855893d2
|
fix: 审批不通过报错 Query return 5 results instead of max 1
|
2022-07-16 17:17:01 +08:00 |
|
YunaiV
|
26ff753701
|
暂时去除回退功能，边界处理不够正确
|
2022-07-08 08:54:15 +08:00 |
|
YunaiV
|
b37a535d20
|
暂时回退流程推断的能力
|
2022-07-08 01:40:52 +08:00 |
|
YunaiV
|
0a2599152d
|
暂时回退流程推断的能力
|
2022-07-08 01:38:19 +08:00 |
|
YunaiV
|
ed28d6d5ed
|
解决单元测试的报错问题
|
2022-07-08 00:41:38 +08:00 |
|
YunaiV
|
da4f300824
|
code review 工作流的驳回逻辑实现代码
|
2022-05-28 22:39:56 +08:00 |
|
YunaiV
|
5c3f30e60f
|
flowable 任务被取消（包括主动取消、会签取消）时，统一进行更新 task 状态。
|
2022-05-28 22:01:17 +08:00 |
|
YunaiV
|
692daf900b
|
优化 BpmParallelMultiInstanceBehavior 逻辑，实现会签、或签的任务分配
|
2022-05-28 17:52:24 +08:00 |
|
YunaiV
|
39e89bd378
|
重构 bpmn 任务的处理人的逻辑，收拢到 BpmTaskAssignRuleService
|
2022-05-28 12:24:58 +08:00 |
|
YunaiV
|
4657dcf91a
|
彻底移除 activiti 组件，专注 flowable 工作流
|
2022-05-28 05:33:20 +08:00 |
|
YunaiV
|
741dda8d75
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
|
2022-05-26 19:19:48 +08:00 |
|
kemengkai
|
870a0b4be5
|
查询审批单详情，流程顺序Bug修复！
|
2022-05-17 17:44:11 +08:00 |
|
kemengkai
|
a0d574ad20
|
增加任务流程预测功能，预测未审批等待审批的任务流程。
|
2022-05-16 16:25:16 +08:00 |
|
kemengkai
|
d43006dce8
|
增加初步驳回功能
dom4j增加失败
|
2022-05-11 10:17:40 +08:00 |
|
cuicui20210817
|
85426568bf
|
flowable单元测试
|
2022-05-06 17:47:01 +08:00 |
|
kemengkai
|
0e988ce51d
|
增加会签或签
|
2022-05-05 17:09:06 +08:00 |
|
YunaiV
|
0f21b55e6d
|
解决 Oracle 关键字冲突的问题
导出最新的 SQL 脚本
|
2022-05-01 23:18:50 +08:00 |
|
YunaiV
|
7db1a58bfc
|
适配 Oracle 数据库
1. 去除关键字，避免数据库的查询冲突
|
2022-05-01 13:33:02 +08:00 |
|
cuicui
|
3a4b0f4f75
|
合并bpm-base和bpm-flowable 为bpm-biz
|
2022-05-01 09:31:24 +08:00 |
|
YunaiV
|
30e886be6f
|
解决 PostgreSQL 集成 Quartz 时的报错
|
2022-04-30 22:52:55 +08:00 |
|
cuicui
|
4015724417
|
Merge remote-tracking branch 'origin/master' into feature/bpm-back
|
2022-04-30 20:52:46 +08:00 |
|
YunaiV
|
e24c8c3425
|
修改实体和 Mapper，解决 PostgreSQL 查询报错的问题
|
2022-04-30 20:09:36 +08:00 |
|