xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
3 years ago |
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
3 years ago |
|
xingyu
|
0b3640a522
|
fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
|
3 years ago |
YunaiV
|
75c74590e5
|
修复工作流创建流程时，流程名可能不存在的问题
|
3 years ago |
SuperHao
|
4592b79deb
|
bugfix: 转换HistoricTaskInstance.createTime -> BpmTaskRespVO.createTime
Signed-off-by: SuperHao <jacky.jihao@gmail.com>
|
3 years ago |
|
YunaiV
|
d16d20fc22
|
修复 BpmTaskAssignRuleServiceImplTest 单测报错的问题
|
3 years ago |
|
YunaiV
|
de7d26129c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
# 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/task/vo/task/BpmTaskTodoPageReqVO.java
|
3 years ago |
|
YunaiV
|
c3eb9022b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
3 years ago |
|
YunaiV
|
3d3c88dd4f
|
完善 AdminUserServiceImpl 单元测试
|
3 years ago |
|
YunaiV
|
96e8fa4216
|
完善 RoleServiceImpl 单元测试
|
3 years ago |
|
YunaiV
|
0537421655
|
完善 DictDataServiceImpl 单元测试
|
3 years ago |
|
YunaiV
|
bef06ef940
|
完善 PostServiceImpl 单元测试
|
3 years ago |
|
YunaiV
|
1011de3278
|
完善 DeptServiceImpl 单元测试
|
3 years ago |
|
YunaiV
|
98bf423569
|
bpm：增加待办任务
|
3 years ago |
|
YunaiV
|
3e4d388e70
|
bpm：增加 OA 请假的创建
|
3 years ago |
|
YunaiV
|
fe6adf693b
|
bpm：完成流程表单
|
3 years ago |
|
YunaiV
|
711a39b8e9
|
spring doc：增加模块分组
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
3 years ago |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
fea1ad8f8d
|
升级最新依赖
|
3 years ago |
|
xingyu4j
|
a43b884c73
|
fix: warn
|
3 years ago |
|
芋道源码
|
8c4ba396be
|
!309 fix:流程代办，日期时区转换错误
Merge pull request !309 from zy_2021/master
|
3 years ago |
|
xingyu
|
0d0f64e30a
|
feat: 删除过期方法
|
3 years ago |
zy
|
65ba4b6ae0
|
fix:claimTime 转换时也加时区设置，并进行非空判断
|
3 years ago |
|
zy
|
ab164d93f0
|
fix:流程代办，日期时区转换错误
|
3 years ago |
|
YunaiV
|
c5b547e0f3
|
优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度
|
3 years ago |
|
芋道源码
|
62a6a993a8
|
!284 bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化"
Merge pull request !284 from SuperHao/N/A
|
3 years ago |
|
YunaiV
|
d3b6a0ca69
|
1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
|
3 years ago |
|
xingyu4j
|
632a132a6a
|
refactor: Date ==> LocalDateTime
|
3 years ago |
|
SuperHao
|
26c728b050
|
bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化"
|
3 years ago |
|
xingyu
|
9054a772b0
|
feat: 升级依赖
|
3 years ago |
|
xingyu
|
91cf15fc26
|
fix: #I5KUUB
|
4 years ago |
|
YunaiV
|
2866b58741
|
1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度
2. 完整移除 activiti 遗留的东东
|
4 years ago |
|
YunaiV
|
62dc600c51
|
reactor：完善多租户的配置类
|
4 years ago |
|
YunaiV
|
4fe3da058c
|
更新 README 文档
|
4 years ago |
|
YunaiV
|
7ab0dfbe6e
|
完善 BPM 代码，补充工作流的视频教程
|
4 years ago |
|
xingyu
|
f4217fe4d7
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
xingyu
|
f84f3a3631
|
refactor: 时间区间查询传入数组-测试模块
|
4 years ago |
|
芋道源码
|
26f684e945
|
!223 refactor: 时间区间查询传入数组
Merge pull request !223 from xingyu/master
|
4 years ago |
|
xingyu
|
dad10d858a
|
refactor: 时间区间查询传入数组
|
4 years ago |
|
YunaiV
|
c1e2e9032c
|
优化前端的依赖安装，使用 yarn 替代
|
4 years ago |
|
YunaiV
|
907c7e763f
|
增加文档、视频教程的地址
|
4 years ago |
|
YunaiV
|
b0cdfd7afc
|
完善工作流的注释
|
4 years ago |
wzy
|
16855893d2
|
fix: 审批不通过报错 Query return 5 results instead of max 1
|
4 years ago |
|
YunaiV
|
26ff753701
|
暂时去除回退功能，边界处理不够正确
|
4 years ago |
|
YunaiV
|
b37a535d20
|
暂时回退流程推断的能力
|
4 years ago |
|
YunaiV
|
0a2599152d
|
暂时回退流程推断的能力
|
4 years ago |
|
YunaiV
|
ed28d6d5ed
|
解决单元测试的报错问题
|
4 years ago |