From 1b50d8ee33a7ccdac2b7963343acf7d97f05f78f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 四月 2026 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_君歌化工' into dev_天津_君歌化工
---
src/main/java/com/ruoyi/production/mapper/ProductProcessMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductProcessMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductProcessMapper.java
index b2168c3..7f8aadd 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductProcessMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductProcessMapper.java
@@ -14,7 +14,8 @@
@Mapper
public interface ProductProcessMapper extends BaseMapper<ProductProcess> {
- IPage<ProductProcessDto> listPage(Page page,@Param("productProcessDto") ProductProcessDto productProcessDto);
+
+ IPage<ProductProcessDto> listPage(Page page, @Param("productProcessDto") ProductProcessDto productProcessDto);
List<processDataProductionStatisticsDto> calculateProductionStatistics(LocalDateTime startDateTime, LocalDateTime endDateTime, Long userId, List<Long> processIds);
}
--
Gitblit v1.9.3