-
- 修复ErpSaleStatisticsMapper.xml中硬编码使用getRequiredTenantId()导致的空指针异常 - 修复ErpPurchaseStatisticsMapper.xml中硬编码使用getRequiredTenantId()导致的空指针异常 - 使用条件判断getTenantId() != null来决定是否添加租户条件 - 添加单元测试验证多租户开启和关闭时的统计查询功能 - 确保向后兼容，多租户开启时正常工作，关闭时不报错
-
Merge pull request !1351 from puhui999/vben5-antd-general
-
Merge pull request !1350 from puhui999/vben5-antd-schema
-
# Conflicts: # yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java # yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java # yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java
-
Merge pull request !1348 from puhui999/vben5-antd-schema
-
Merge pull request !1347 from 芋道源码/develop-api-remove
-
reactor：【INFRA 基础设施】代码生成时，更严格的区分 master 还是 master-jdk17 分支