From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
index d20ad64..fb1903d 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
@@ -18,21 +18,22 @@
*/
public class ProcedurePlansPageModel {
- @ApiModelProperty(value = "宸ュ簭鍚嶇О", example = "1")
- private String procedureName;
- @ApiModelProperty(value = "宸ュ簭缂栫爜", example = "1")
- private Integer procedureId;
- @ApiModelProperty(value = "涓嶈壇鍝佺巼", example = "1")
- private BigDecimal unqualifiedRate;
@ApiModelProperty(value = "涓嶈壇鍝佹暟", example = "1")
private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "鑹搧鏁�", example = "1")
private BigDecimal qualifiedNum;
@ApiModelProperty(value = "鏈畬宸ユ暟閲�", example = "1")
private BigDecimal undoneNum;
- @ApiModelProperty(value = "璁″垝鐢熶骇鏁伴噺", example = "1")
+ @ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
private BigDecimal num;
- @ApiModelProperty(value = "璁″垝涓暟", example = "1")
- private Integer planCount;
+ @ApiModelProperty(value = "涓嶈壇鍝佺巼%", example = "1")
+ private BigDecimal unqualifiedRate;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String materialCode;
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String procedureName;
+
+ @ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
+ private Integer status;
}
--
Gitblit v1.9.3