From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
index 6beaab2..8d85fc5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
@@ -158,20 +158,33 @@
* lsv2
*/
//鎿嶄綔妯″紡
+ @JSONField(name = "OperationType")
private String operationType;
//褰撳墠绋嬪簭
private String program;
//绋嬪簭鎵ц鐐�
+ @JSONField(name = "ProgramPosition")
private String programPosition;
//蹇�熻繘缁欏�嶇巼
+ @JSONField(name = "Rapidfeed")
private String rapidfeed;
//绗竴涓敊璇彿
+ @JSONField(name = "FirstErrorNum")
private String firstErrorNum;
//绗竴涓敊璇�
+ @JSONField(name = "FirstError")
private String firstError;
//绗簩涓敊璇彿
+ @JSONField(name = "SecondErrorNum")
private String secondErrorNum;
+ //杩涚粰鍊嶇巼
+ @JSONField(name = "Ffeed")
+ private String fFeed;
+ //涓昏酱鍊嶇巼
+ @JSONField(name = "Sfeed")
+ private String sFeed;
//绗簩涓敊璇�
+ @JSONField(name = "SecondError")
private String secondError;
//X鍧愭爣
private String x;
@@ -186,16 +199,22 @@
//C鍧愭爣
private String c;
//閿欒淇℃伅
+ @JSONField(name = "Errorinfo")
private String errorinfo;
//璁惧淇℃伅
+ @JSONField(name = "Equipmentinfo")
private String equipmentinfo;
//鍩虹淇℃伅
+ @JSONField(name = "Basicinfo")
private String basicinfo;
//棰勮鏁版嵁
+ @JSONField(name = "Preinstall")
private String preinstall;
//NC姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "NCNormalTime")
private String nCNormalTime;
//璁惧姝ｅ父杩愯鏃堕棿
+ @JSONField(name = "EquipmentNormalTime")
private String equipmentNormalTime;
// 璁惧ID
--
Gitblit v1.9.3