Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

zenglf

2023-10-24 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb

 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;