16 Commits
Author SHA1 Message Date
YunaiV 244a5cfa01 fix(docker): 对齐各版本项目的 Java 运行时镜像
fix(test): 修正 Redis 配置层级并适配 Spring Boot 版本
2026-10-05 21:08:25 +08:00
YunaiV 9efecd07ad Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
#	yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
2026-09-26 23:09:14 +08:00
YunaiV e171ccf5f9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
#	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
#	yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
#	yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java
#	yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
2026-09-26 23:03:46 +08:00
YunaiV 1765e42e90 test(hrm): 补充工资表空分类表头回归测试 2026-09-26 22:52:33 +08:00
YunaiV 97b5ab3ef2 fix(hrm): 修复工资表生成空分类表头
关联:https://t.zsxq.com/WRIEJ
2026-09-26 22:43:59 +08:00
YunaiV cb160583b4 fix(hrm): 修复工资表生成空分类表头
关联:https://t.zsxq.com/WRIEJ
2026-09-26 22:43:59 +08:00
YunaiV 1594eb97ab fix(hrm): 统一定薪调薪工资项范围
关联:https://t.zsxq.com/hhClm
2026-09-26 22:21:50 +08:00
YunaiV 25f030ddcf fix(hrm): 统一定薪调薪工资项范围
关联:https://t.zsxq.com/hhClm
2026-09-26 22:21:50 +08:00
YunaiV 60a33f54b9 [BUG] HRM:管理端「候选人转员工」恒失败——服务端回填 channelId 与 createEmployee 隐藏字段校验互斥(1050100034)- #1211
#1211
2026-09-26 10:35:54 +08:00
芋道源码 1afc774be4 Merge pull request #1211 from dadiyang/fix/hrm-convert-employee-channel-field-exempt
[BUG] HRM:管理端「候选人转员工」恒失败——服务端回填 channelId 与 createEmployee 隐藏字段校验互斥(1050100034)
2026-09-26 10:34:45 +08:00
dadiyang 8a96d60f60 fix(hrm):候选人转员工(convert)携带 candidateId 时豁免 channelId 的隐藏字段校验——服务端回填的招聘渠道不再撞「员工字段未显示」互斥(1050100034)(A41) 2026-09-23 19:36:33 +08:00
YunaiV 651538ae40 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2026-09-19 11:02:17 +08:00
YunaiV 09cf3017e1 feat(oa): add office automation 2026-09-19 10:11:41 +08:00
YunaiV 2bbe79b34a 【同步】jdk21 和 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
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2026-08-15 00:48:30 +08:00
YunaiV bff1706259 README:增加 FMS、HRM 说明(别催进度了,token 都冒烟了) 2026-08-14 22:53:13 +08:00
YunaiV e2fa61b7e5 feat(hrm): consolidate human resources management 2026-08-14 21:30:46 +08:00