From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/DigitalTwin.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
index 939e317..3681448 100644
--- a/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
+++ b/src/main/java/com/zy/asrs/entity/param/DigitalTwin.java
@@ -5,20 +5,18 @@
@Data
public class DigitalTwin {
private Integer count; //鎬婚噺
-// private Integer countO; //绌烘�婚噺
-// private Integer countF; //闈炵┖鎬婚噺
private int fqty; //鍦ㄥ簱搴撲綅
private int oqty;//绌哄簱浣�
private int uqty;//浣跨敤搴撲綅
private int xqty;//绂佺敤搴撲綅
- private Integer countL; //鎬婚噺
+ private Integer countL; //绔嬪簱鎬婚噺
private int fqtyL; //绔嬪簱鍦ㄥ簱搴撲綅
private int oqtyL;//绔嬪簱绌哄簱浣�
private int uqtyL;//绔嬪簱浣跨敤搴撲綅
private int xqtyL;//绔嬪簱绂佺敤搴撲綅
- private Integer countP; //鎬婚噺
+ private Integer countP; //骞冲簱鎬婚噺
private int fqtyP; //骞冲簱鍦ㄥ簱搴撲綅
private int oqtyP;//骞冲簱绌哄簱浣�
private int uqtyP;//骞冲簱浣跨敤搴撲綅
--
Gitblit v1.9.1