2917 Commits

Author SHA1 Message Date
YunaiV 43c5582039 fix: 修复 JDK8 下 Oracle 驱动依赖不兼容问题
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
2026-10-05 21:43:00 +08:00
YunaiV 4d15293af5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-gateway/Dockerfile
#	yudao-module-ai/yudao-module-ai-server/Dockerfile
#	yudao-module-bpm/yudao-module-bpm-server/Dockerfile
#	yudao-module-crm/yudao-module-crm-server/Dockerfile
#	yudao-module-erp/yudao-module-erp-server/Dockerfile
#	yudao-module-im/yudao-module-im-server/Dockerfile
#	yudao-module-infra/yudao-module-infra-server/Dockerfile
#	yudao-module-mall/yudao-module-product-server/Dockerfile
#	yudao-module-mall/yudao-module-promotion-server/Dockerfile
#	yudao-module-mall/yudao-module-statistics-server/Dockerfile
#	yudao-module-mall/yudao-module-trade-server/Dockerfile
#	yudao-module-member/yudao-module-member-server/Dockerfile
#	yudao-module-mes/yudao-module-mes-server/Dockerfile
#	yudao-module-mp/yudao-module-mp-server/Dockerfile
#	yudao-module-pay/yudao-module-pay-server/Dockerfile
#	yudao-module-pay/yudao-module-pay-server/src/test/resources/application-unit-test.yaml
#	yudao-module-report/yudao-module-report-server/Dockerfile
#	yudao-module-system/yudao-module-system-server/Dockerfile
#	yudao-module-wms/yudao-module-wms-server/Dockerfile
#	yudao-server/Dockerfile
2026-10-05 21:09:59 +08:00
YunaiV 0dfc386658 fix(docker): 对齐各版本项目的 Java 运行时镜像
fix(test): 修正 Redis 配置层级并适配 Spring Boot 版本
2026-10-05 21:07:17 +08:00
YunaiV 2d967e7d2d fix(docker): 对齐各版本项目的 Java 运行时镜像
fix(test): 修正 Redis 配置层级并适配 Spring Boot 版本
2026-10-05 21:07:10 +08:00
YunaiV 77dd74e65c (〃'▽'〃)_v2026_09_发布:新增 OA 协同办公、PMS 项目管理,支持独立手机端操作
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
v2026.09(jdk8/11)
2026-09-27 01:02:02 +08:00
YunaiV 87acf3afce Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2026-09-27 01:01:45 +08:00
YunaiV d322a10b98 (〃'▽'〃)_v2026_09_发布:新增 OA 协同办公、PMS 项目管理,支持独立手机端操作 v2026.09(jdk17/21) 2026-09-27 01:01:32 +08:00
YunaiV 25125dfea6 feat:增强对 JDK8 的兼容性 2026-09-26 23:24:30 +08:00
YunaiV 231a1c2e2c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
#	yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
#	yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
#	yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java
#	yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBrokerageOrderHandler.java
#	yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java
#	yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
2026-09-26 23:14:36 +08:00
YunaiV 088da8165b 【同步】BOOT 和 CLOUD 的功能(oa) 2026-09-26 23:07:52 +08:00
YunaiV a2f239c61a fix(iot): 修复 JDK8 网关 Kotlin 和 Okio 依赖冲突 2026-09-26 22:56:58 +08:00
YunaiV a24b7ee2ce fix(hrm): 修复工资表生成空分类表头
关联:https://t.zsxq.com/WRIEJ
2026-09-26 22:44:00 +08:00
YunaiV 8cedced2a6 fix(hrm): 修复工资表生成空分类表头
关联:https://t.zsxq.com/WRIEJ
2026-09-26 22:43:59 +08:00
YunaiV bf7deb93ea Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2026-09-26 22:43:34 +08:00
YunaiV 709653ab5a fix(hrm): 统一定薪调薪工资项范围
关联:https://t.zsxq.com/hhClm
2026-09-26 22:21:51 +08:00
YunaiV 58db306652 fix(hrm): 统一定薪调薪工资项范围
关联:https://t.zsxq.com/hhClm
2026-09-26 22:21:50 +08:00
YunaiV 6e41a279c6 fix(oa): 补充邮箱服务器主机名与 IP 地址校验
关联:https://t.zsxq.com/y1ggF
2026-09-26 21:38:49 +08:00
YunaiV ec3979fe25 fix(oa): 补充邮箱服务器主机名与 IP 地址校验
关联:https://t.zsxq.com/y1ggF
2026-09-26 21:38:48 +08:00
YunaiV 654415c096 fix(system): 补充微信 HttpClient5 运行时依赖 2026-09-26 14:24:42 +08:00
芋道源码 db39e09bbf !268 necktie(brokerage): 一级推广人取订单推广人
Merge pull request !268 from wuKong/necktie/necktie(brokerage)-一级推广人取订单推广人
2026-09-26 05:35:09 +00:00
芋道源码 f35d0aa469 !269 feat(area): 补全国内已知行政地区
Merge pull request !269 from wuKong/wuKong/feat(area)-补全国内已知行政地区
2026-09-26 05:14:33 +00:00
YunaiV 484224c9f4 fix(mes): 修复采购入库上架明细批次丢失 2026-09-26 11:56:09 +08:00
YunaiV 356df7d23c fix(mes): 修复采购入库上架明细批次丢失 2026-09-26 11:56:08 +08:00
YunaiV 13749eae2e build: 对齐 Lombok 和 MapStruct 的 BOM 与注解处理器版本 2026-09-26 00:33:55 +08:00
YunaiV a3a361abc7 build: 对齐 Lombok 和 MapStruct 的 BOM 与注解处理器版本
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-09-26 00:33:32 +08:00
YunaiV 62c0d4836e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2026-09-26 00:14:46 +08:00
YunaiV b31f5a60bd build: 升级 BOM 依赖并保持各 Spring Boot 版本的积木报表兼容性 2026-09-26 00:13:08 +08:00
YunaiV da7b3287fb build: 升级 BOM 依赖并保持各 Spring Boot 版本的积木报表兼容性 2026-09-26 00:12:42 +08:00
YunaiV 5a9e2c2b67 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2026-09-25 23:11:54 +08:00
YunaiV 444ca1af17 fix: 启用 AI 和报表模块并按项目版本对齐 Spring AI BOM 2026-09-25 23:11:07 +08:00
YunaiV 9704c2946a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2026-09-25 21:14:56 +08:00
YunaiV ca09991cca fix: 排除积木报表传递引入的旧版 Swagger Jakarta 注解依赖 2026-09-25 21:13:46 +08:00
YunaiV 1a1b64beb6 feat:增强对 JDK8 的兼容性(OA)
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-09-19 11:22:42 +08:00
YunaiV 65ee68a37f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-gateway/src/main/resources/application.yaml
2026-09-19 11:00:53 +08:00
YunaiV c45be958a6 feat(oa):README 2026-09-19 10:59:38 +08:00
YunaiV d5e694c593 【同步】BOOT 和 CLOUD 的功能(oa) 2026-09-19 10:05:26 +08:00
YunaiV 15892e0a3e 【同步】BOOT 和 CLOUD 的功能(oa) 2026-09-19 09:54:09 +08:00
wuKong 1b6a26562d feat(area): 补全国内已知行政地区
- 恢复香港特别行政区和澳门特别行政区的正确层级映射
- 修正东莞市、中山市、儋州市、嘉峪关市的区域代码格式
- 将河南省济源市调整为省直辖县级行政区划
- 统一湖北省、海南省、新疆自治区的县级行政区划代码
- 添加多个地级市的经济开发区和高新技术产业园区
- 补充直辖市和特别行政区的下级行政区域划分
2026-09-07 19:29:11 +08:00
YunaiV d3fd80e24a feat:增强对 JDK8 的兼容性
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2026-09-04 10:00:15 +08:00
YunaiV 725d2612da Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-gateway/src/main/resources/application.yaml
2026-09-04 08:55:40 +08:00
YunaiV 589b75a1f2 README:增加 PMS 说明(期待 AGI ing) 2026-09-04 08:53:06 +08:00
YunaiV 4cd4d3f133 【同步】BOOT 和 CLOUD 的功能(pms) 2026-09-04 08:41:11 +08:00
wuKong fa97706173 👔 necktie(brokerage): 一级推广人取订单推广人
- 在 addBrokerage 方法中添加 brokerageUserId 参数
- 更新 BrokerageRecordService 接口和实现类的方法定义
- 修改 TradeBrokerageOrderHandler 中的调用逻辑
- 调整日志输出以包含新的推广人参数
- 使用 getBrokerageUser 替换 getBindBrokerageUser 获取推广人信息
2026-09-02 15:33:27 +08:00
YunaiV 5705b991cc (〃'▽'〃)_v2026_08_发布:新增 HRM 人力资源管理系统、FMS 财务管理系统,支持独立手机端操作
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
v2026.08(jdk8/11)
2026-08-30 20:41:22 +08:00
YunaiV 85c230ee12 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2026-08-30 20:41:06 +08:00
YunaiV 98aadb3ae0 (〃'▽'〃)_v2026_08_发布:新增 HRM 人力资源管理系统、FMS 财务管理系统,支持独立手机端操作 v2026.08(jdk17/21) 2026-08-30 20:40:42 +08:00
YunaiV 0445b85852 feat:增强对 JDK8 的兼容性 2026-08-30 20:24:12 +08:00
YunaiV 5544172333 feat:增强对 JDK8 的兼容性 2026-08-30 20:23:59 +08:00
YunaiV fc1ab33923 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-fms/yudao-module-fms-server/src/test/java/cn/iocoder/yudao/module/fms/service/config/FmsAccountUserServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/insurance/monthrecord/HrmInsuranceMonthEmployeeRecordServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/performance/assessment/HrmPerformanceAssessmentProcessServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/recruit/candidate/HrmRecruitInterviewServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/recruit/post/HrmRecruitPostServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/salary/config/HrmSalaryGroupServiceImplTest.java
#	yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/salary/slip/HrmSalarySlipServiceImplTest.java
2026-08-30 19:42:48 +08:00
YunaiV df1f45530e 【同步】BOOT 和 CLOUD 的功能 2026-08-30 19:42:20 +08:00