From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
index 88fe4b6..46373b2 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
@@ -1,11 +1,8 @@
package com.ruoyi.home.dto;
-
-import com.ruoyi.production.dto.ProductOrderDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
@@ -21,5 +18,5 @@
@ApiModelProperty("閮ㄥ垎瀹屾垚璁㈠崟鏁�")
private Long partialCompletedOrderCount;
@ApiModelProperty("璁㈠崟璇︽儏")
- private List<ProductOrderDto> completedOrderDetails;
+ private List<ProductionProgressOrderDto> completedOrderDetails;
}
--
Gitblit v1.9.3