添加备注信息

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/DetailssAmountVO.java

@@ -58,7 +58,7 @@ public class DetailssAmountVO {
 
     @Excel(name = "所属单位",orderNum ="8")
     @ApiModelProperty(value = "所属单位")
-    private String remark;
+    private String agencyName;
 
     @Excel(name = "入库时间",orderNum ="9", format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -94,6 +94,8 @@ public class DetailssAmountVO {
     @Excel(name = "装备定义名称",orderNum ="15")
     @ApiModelProperty(value = "装备定义名称")
     private String equipmentName;
-
-
+    
+    @Excel(name = "备注说明",orderNum ="16")
+    @ApiModelProperty(value = "备注说明")
+    private String remark;
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml

@@ -182,10 +182,11 @@
 --             wlp.measure,
             wles.iot_code,
             wled.equipment_id,
+            wles.remark agencyName,
             wled.equipment_name
             FROM
             wl_equipment_detail wled
-            LEFT JOIN ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id FROM wl_equipment_specific ) wles ON wles.equipment_detail_id = wled.id
+            LEFT JOIN ( SELECT id, qr_code, CODE, iot_code, create_date, equipment_detail_id, system_id, agency_name FROM wl_equipment_specific ) wles ON wles.equipment_detail_id = wled.id
             LEFT JOIN ( SELECT id, amount, STATUS, equipment_specific_id, warehouse_structure_id FROM wl_stock_detail ) wlsd ON wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws ON wlsd.warehouse_structure_id = wlws.id
 --             LEFT JOIN wl_equipment_params wlp ON wlp.code = wled.eq_code