From 41a77633d7be6d40195ce6fcb9a697bbc66e2fb5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 16:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
index 99d9e61..88fe4b6 100644
--- a/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
+++ b/src/main/java/com/ruoyi/home/dto/ProductionProgressDto.java
@@ -12,14 +12,14 @@
@ApiModel
public class ProductionProgressDto {
@ApiModelProperty("鎬昏鍗曟暟")
- private Integer totalOrderCount;
+ private Long totalOrderCount;
@ApiModelProperty("宸插畬鎴愯鍗曟暟")
- private Integer completedOrderCount;
+ private Long completedOrderCount;
@ApiModelProperty("鏈畬鎴愯鍗曟暟")
- private Integer uncompletedOrderCount;
- @ApiModelProperty("鎬讳綋瀹屾垚杩涘害")
- private BigDecimal completedProgressCount;
+ private Long uncompletedOrderCount;
+ @ApiModelProperty("閮ㄥ垎瀹屾垚璁㈠崟鏁�")
+ private Long partialCompletedOrderCount;
@ApiModelProperty("璁㈠崟璇︽儏")
private List<ProductOrderDto> completedOrderDetails;
}
--
Gitblit v1.9.3