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

liu

3 天以前 5f612ab2f67b2c6f6894c624a7780799526d566d

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java

@@ -211,7 +211,7 @@
                        .productPrice(null).count(null).taxPercent(null).needProduction(0).itemRemark("").build()
        );
        // 输出
        ExcelUtils.write(response, "销售订单导入模板.xls", "销售订单列表", ErpSaleOrderImportExcelVO.class, list);
        ExcelUtils.writeTemplate(response, "销售订单导入模板.xls", "销售订单列表", ErpSaleOrderImportExcelVO.class, list);
    }

    @PostMapping("/import")