Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-10-15 3584e8df5666ac5fd5bc160b4645512e789621af

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java

@@ -198,7 +198,7 @@
            }

            PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
            if(supplierClinicId.isEmpty()){
            if(CollectionUtils.isEmpty(supplierClinicId)){
                return pageInfo;
            }
            List<TErpProcurementVo> list = this.baseMapper.pageListWarehouse(query, pageInfo, user, sTime, eTime, supplierClinicId);