Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

liu

4 天以前 5f612ab2f67b2c6f6894c624a7780799526d566d

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java

@@ -120,7 +120,7 @@
                        .remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "设备入库单导入模板.xls", "设备入库单列表", MesWmEquipmentReceiptImportExcelVO.class, list);
        ExcelUtils.writeTemplate(response, "设备入库单导入模板.xls", "设备入库单列表", MesWmEquipmentReceiptImportExcelVO.class, list);
    }

    @PostMapping("/import")