update

Lius

2023-10-12 a6d22f16447c4b440b269fa8b43daf919e5a10c4

update

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

@@ -38,6 +38,12 @@
    private String equipmentId;

    /**
     * 设备图片
     */
    @ApiModelProperty(value = "设备图片")
    private String equipmentImage;

    /**
     * 坐标-左
     */
    @ApiModelProperty(value = "坐标-左")

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

@@ -204,7 +204,7 @@
        <where>
            AND mwe.workshop_id = #{ workshopEquipmentVo.workshopId }
            <if test="workshopEquipmentVo.equipmentId != null and workshopEquipmentVo.equipmentId != ''">
                AND mwe.equipment_id = #{equipmentId}
                AND mwe.equipment_id = #{ workshopEquipmentVo.equipmentId }
            </if>
        </where>
        ORDER BY me.equipment_id

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml

@@ -7,7 +7,7 @@
        SELECT
            mew.id id,
            a.EquipmentID equipmentId,
            a.EquipmentName equipmentName,
            mew.equipment_image equipmentImage,
            a.Oporation equipmentStatus,
            mew.coordinate_left coordinateLeft,
            mew.coordinate_top coordinateTop,