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

qushaowei

2024-01-15 901a05d4dcf6a61f3387715f7074831a7ce04ead

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java

@@ -122,6 +122,13 @@
    @ApiModelProperty(value = "设备功率")
    private String devicePower;

    /**
     * 设备状态
     */
    @Excel(name = "设备状态", width = 15)
    @ApiModelProperty(value = "设备状态")
    private Integer equipmentStatus;

    /**部门名称*/
    private transient String orgCodeTxt;