Commit Graph

2137 Commits (a7f1f203d43275b7f260ef0e1058adc8fbbdaae7)

Author SHA1 Message Date
Tpj a7f1f203d4 版本跟新 2025-01-03 14:32:36 +08:00
Tpj 332efc7b58 版本跟新 2025-01-03 14:01:12 +08:00
Tpj 96916bd204 版本跟新 2025-01-03 13:59:36 +08:00
Tpj e0f85248d0 版本跟新 2025-01-03 13:52:51 +08:00
Tpj b4644366e0 版本跟新 2025-01-03 13:45:52 +08:00
Tpj 1cb131a491 跟新系统管理模块 2025-01-03 11:49:28 +08:00
Tpj 0bae1ef0a2 跟新系统管理模块 2025-01-03 11:40:42 +08:00
老唐解忧铺 7fce099986 统计一合并
Signed-off-by: 老唐解忧铺 <295983632@qq.com>
2025-01-02 09:23:19 +00:00
YunaiV 5d1c26c738 V2.4.0 发布~ 2024-12-31 09:37:38 +08:00
YunaiV 59fa135677 【同步】BOOT 和 CLOUD 的功能(所有) 2024-12-31 09:36:40 +08:00
YunaiV 0082bd2189 【同步】BOOT 和 CLOUD 的功能(所有) 2024-12-31 09:36:14 +08:00
YunaiV 8bfa39a59e 【升级】lombok from 1.18.34 to 1.18.36 2024-12-28 18:00:34 +08:00
YunaiV 94b0bc913e 【升级】spring boot admin from 3.3.3 to 3.4.1 2024-12-28 17:54:37 +08:00
YunaiV b0574bfb08 【升级】mybatis-plus from 3.5.8 to 3.5.9 2024-12-28 17:33:27 +08:00
YunaiV 60b643502a 【升级】netty from 4.1.113 to 4.1.116
【升级】velocity from 2.4 to 2.4.1
【升级】guava from 33.3.1 to 33.4.0
2024-12-28 13:30:16 +08:00
YunaiV 9a3e9cdd4f 【升级】hutool from 5.8.32 to 5.8.35 2024-12-28 13:17:52 +08:00
YunaiV c2e92cc9a9 【升级】mapstruct from 1.6.2 to 1.6.3 2024-12-28 13:08:50 +08:00
YunaiV 4d5983bf11 【升级】knife4j from 4.5.0 to 4.6.0(社区版) 2024-12-28 12:44:09 +08:00
YunaiV 547ec2c7c5 【升级】redisson from 3.36.0 to 3.41.0 2024-12-28 11:52:52 +08:00
YunaiV 11939ee7b1 【升级】spring boot from 3.3.4 to 3.4.1 2024-12-28 11:37:38 +08:00
YunaiV e5c036a60d 【同步】BOOT 和 CLOUD 的功能(所有) 2024-12-27 22:19:09 +08:00
izao 3d151e97ef 分销模块基础代码 2024-12-27 16:47:31 +08:00
Tpj b3afcfaa72 更新HR人事管理模块 2024-12-25 08:57:10 +08:00
Tpj ab73d7d7da 更新HR人事管理模块 2024-12-25 08:56:11 +08:00
Tpj 3f91c111e7 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-19 10:36:23 +08:00
Tpj 68fe169edd 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-19 10:35:52 +08:00
Tpj 25c888df75 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-11 14:08:36 +08:00
Tpj 35b8e48088 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-11 14:05:44 +08:00
Tpj 697b5edb04 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 11:28:25 +08:00
Tpj 5598b69b97 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 11:27:41 +08:00
Tpj 9bb220dbbe 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 11:19:24 +08:00
Tpj c169f001ea 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 11:17:57 +08:00
Tpj 4c33a1cb38 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 11:02:17 +08:00
Tpj afaeb7e054 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 10:49:47 +08:00
Tpj 5eb727869e 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 10:47:41 +08:00
Tpj 0c89b09da8 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 10:47:30 +08:00
Tpj 95c7c35a2f 跟新海上商城mall会员模块添加了分销模块定义启动项 2024-12-09 10:44:10 +08:00
Tpj c0645f0d17 跟新海上商城mall会员模块添加了分销模块定义 2024-12-07 09:50:37 +08:00
YunaiV 527a635155 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-12-01 17:41:34 +08:00
YunaiV c322c53b45 【功能修复】商城:trade 服务,启动失败 2024-12-01 17:41:00 +08:00
YunaiV ab5c790b3d 【功能修复】Job 组件:修复多租户下,XXL-Job 无法传参的问题 2024-12-01 16:37:21 +08:00
YunaiV 4c978ab78f 【同步】BOOT 和 CLOUD 的功能(支付相关) 2024-11-25 20:31:24 +08:00
YunaiV 2b8334018a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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/brokerage/vo/record/BrokerageRecordBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.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/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreUpdateReqVO.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/DeliveryPickUpStoreService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.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/controller/admin/app/vo/PayAppBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/notify/PayNotifyController.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
2024-11-25 20:26:19 +08:00
YunaiV 50e47434bb 【同步】BOOT 和 CLOUD 的功能(支付相关) 2024-11-25 20:26:00 +08:00
YunaiV 18b63f4e05 【同步】BOOT 和 CLOUD 的功能 2024-11-23 11:19:17 +08:00
YunaiV 2031f42396 【同步】BOOT 和 CLOUD 的功能 2024-11-23 11:17:15 +08:00
YunaiV 14c49629b7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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/controller/admin/task/vo/task/BpmTaskReturnReqVO.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/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
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityBaseVO.java
2024-11-23 11:13:01 +08:00
YunaiV 90d006b4c9 【同步】BOOT 和 CLOUD 的功能(所有) 2024-11-23 11:12:04 +08:00
YunaiV 10b2d10fcc 【功能新增】bpm:仿钉钉、飞书的设计器 2024-11-23 11:03:12 +08:00
YunaiV 91180bc65b 【缺陷修复】gateway:文档的 ai-server 错误写成 crm-server 2024-11-22 19:45:37 +08:00