From 729d1f77dee77833879d82149d1731802b981733 Mon Sep 17 00:00:00 2001 From: zenglf <18502938215@163.com> Date: 星期二, 31 十月 2023 15:23:10 +0800 Subject: [PATCH] Merge branch 'develop' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 796493d..6beaab2 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 @@ -199,8 +199,8 @@ private String equipmentNormalTime; // 璁惧ID - @JSONField(name = "EquipmentID") - private String EquipmentID; +// @JSONField(name = "EquipmentID") +// private String EquipmentID; // KI1鐘舵�� @JSONField(name = "P1001") private String P1001; -- Gitblit v1.9.3