gitee/yudao-boot-mini
1
0
Fork 0
mirror of https://gitee.com/yudaocode/yudao-boot-mini.git synced 2026-10-06 06:12:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,823 Commits 3 Branches 50 Tags
9efecd07adebf2f5312034bbd9a59895cd2eed0c
Commit Graph
11823 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 42f27923c8 fix(iot): 修复 JDK8 网关 Kotlin 和 Okio 依赖冲突 2026-09-26 22:56:58 +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 b572669c16 fix(mall): 补齐商城统计查询的租户过滤条件 
补齐订单、售后、佣金、会员、钱包、访问量和商品统计的 tenant_id 条件
覆盖关联子查询和 JOIN 两侧，并将租户条件统一放在 WHERE 条件末尾
保持全局租户拦截器行为不变
 2026-09-26 21:45:05 +08:00
YunaiV 2456e45fc5 fix(oa): 补充邮箱服务器主机名与 IP 地址校验 
关联：https://t.zsxq.com/y1ggF
 2026-09-26 21:38:48 +08:00
YunaiV 20f06c5116 fix(oa): 补充邮箱服务器主机名与 IP 地址校验 
关联：https://t.zsxq.com/y1ggF
 2026-09-26 21:38:47 +08:00
YunaiV 6451538611 test(oa): restore BPM model initializer 2026-09-26 21:11:58 +08:00
YunaiV 00680ddc1b feat(sql): 增加 OceanBase MySQL 模式兼容支持 2026-09-26 20:18:37 +08:00
YunaiV 03ce4fad57 feat(infra): 增加文件上传类型白名单校验 2026-09-26 18:27:12 +08:00
YunaiV 223a4d816a fix(system): 禁止禁用或删除超级管理员和租户管理员账号 2026-09-26 17:48:28 +08:00
YunaiV 459986bfca fix(im): 修复关闭多租户后敏感词检测报错的问题 2026-09-26 17:44:32 +08:00
YunaiV d1937e4330 feat（ai）：AiWorkflowDO 的自增序号 2026-09-26 14:41:00 +08:00
YunaiV 152036a7ab fix(fms): 补齐报表模板及默认公式修正 2026-09-26 13:54:55 +08:00
YunaiV d5fe12ebd6 fix(crm): 校验回款计划关联合同 2026-09-26 13:54:45 +08:00
YunaiV 2a1fc61d83 feat(trade): 按订单推广人结算一级佣金 2026-09-26 13:42:36 +08:00
YunaiV 218b422c4a feat(area): 补全国内已知行政地区数据 2026-09-26 13:17:28 +08:00
YunaiV b0397843a8 fix(fms): 修复账套未初始化时科目操作异常，补全报表模板 
- 新增、修改和导入科目时校验财务参数
- 补全报表模板，修正备抵科目、投资收益和还本公式
- 增加模板升级及报表金额回归测试
 2026-09-26 12:12:34 +08:00
YunaiV 66780d9b1a test(mes): 补充单白班未配置倒班参数的排班回归测试 2026-09-26 11:56:09 +08:00
YunaiV 23fb2a51e2 fix(mes): 修复采购入库上架明细批次丢失 2026-09-26 11:56:08 +08:00
YunaiV 053a100f5f fix(mes): 修复采购入库上架明细批次丢失 2026-09-26 11:56:08 +08:00
YunaiV 7cca10fcc9 [FIX] FMS：报表校验逐月查损益改直调账簿余额，断 getClosingOverview↔checkBalanceSheet 无限递归（A40）- #1215 
#1215
 2026-09-26 11:27:38 +08:00
YunaiV 752852ae19 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 11:24:08 +08:00
芋道源码 27537b4bc6 Merge pull request #1215 from dadiyang/fix/fms-closing-period-recursion 
[FIX] FMS：报表校验逐月查损益改直调账簿余额，断 getClosingOverview↔checkBalanceSheet 无限递归（A40）
 2026-09-26 11:23:40 +08:00
YunaiV 00798feda7 fix(crm): 将产品及商机、合同中的单位字段统一为原始类型 int 2026-09-26 11:16:46 +08:00
YunaiV 40963d63cc 【BUG] 商品：C 端商品列表只传 sortField 不传 sortAsc 恒 500——Boolean 对 null 拆箱 2026-09-26 11:09:46 +08:00
YunaiV 5e562ef624 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 11:07:43 +08:00
芋道源码 a486d4fa0b Merge pull request #1226 from dadiyang/fix/product-spu-app-page-sort-nullsafe 
[BUG] 商品：C 端商品列表只传 sortField 不传 sortAsc 恒 500——Boolean 对 null 拆箱
 2026-09-26 11:06:58 +08:00
YunaiV c71c83bf5d Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 11:06:42 +08:00
芋道源码 56a608a88f Merge pull request #1227 from dadiyang/fix/promotion-combination-app-page-orderby 
[BUG] 拼团：C 端活动列表无排序，新上架活动被挤到后页——app 面 selectPage 缺 orderBy
 2026-09-26 11:06:19 +08:00
YunaiV 79ef2aba35 [ENHANCE] 商城：SPU 创建补 SKU 属性集合为空的前置校验（前端空规格形态拦截、请求不发） 2026-09-26 10:43:34 +08:00
YunaiV ddbfd10161 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 10:42:14 +08:00
芋道源码 330fa3a297 Merge pull request #1234 from dadiyang/fix/product-sku-empty-properties 
[ENHANCE]
 2026-09-26 10:42:05 +08:00
芋道源码 9b5241dd7f Merge pull request #1241 from dadiyang/fix/crm-contract-total-price-validation 
[BUG] CRM：合同金额边界缺口——无明细合同的填写金额被重算覆盖为 0；合同金额字段无负值校验
 2026-09-26 10:41:11 +08:00
YunaiV f68f1f93f4 [FIX] Excel 框架：导入模板下拉对空字典/空选项源整列跳过＋AreaConvert 补写方向（A43，惠及所有模板）- #1217 2026-09-26 10:40:39 +08:00
YunaiV 2b470dd308 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 10:40:09 +08:00
芋道源码 e6a3a14f47 Merge pull request #1217 from dadiyang/fix/hrm-import-template-empty-dict-skip 
[FIX] Excel 框架：导入模板下拉对空字典/空选项源整列跳过＋AreaConvert 补写方向（A43，惠及所有模板）
 2026-09-26 10:40:02 +08:00
YunaiV e693ac194d [FIX] CRM：数据权限切面对无登录用户的系统调用放行，修公海自动掉落 Null key 恒失败（A34）- #1221 
#1221
 2026-09-26 10:38:36 +08:00
YunaiV ac6645d0b3 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 10:38:00 +08:00
芋道源码 052c8f5dda Merge pull request #1221 from dadiyang/fix/crm-permission-aspect-system-context 
[FIX] CRM：数据权限切面对无登录用户的系统调用放行，修公海自动掉落 Null key 恒失败（A34）
 2026-09-26 10:37:50 +08:00
芋道源码 1572855ba2 Merge pull request #1229 from dadiyang/fix/product-category-parent-self 
[BUG] 商品分类：编辑一级类目把"上级分类"选成自己，保存成功且该类目从分类树消失
 2026-09-26 10:36:54 +08:00
YunaiV 60a33f54b9 [BUG] HRM：管理端「候选人转员工」恒失败——服务端回填 channelId 与 createEmployee 隐藏字段校验互斥（1050100034）- #1211 
#1211
 2026-09-26 10:35:54 +08:00
YunaiV 48766e6024 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 10:34:56 +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
YunaiV 9f3b274ba9 [BUG] CRM/ERP：产品删除无引用校验——被业务单据引用的产品可被直接软删，留下悬空引用 #1242 2026-09-26 10:26:21 +08:00
YunaiV 13fd48ee1a Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2026-09-26 10:19:39 +08:00