Merge remote-tracking branch 'origin/master'

cy

2023-11-30 0c31534172f689160c95a4ff61df11712b6890fe

 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -424,7 +424,7 @@
    @GetMapping("/list/export")
    public void export(Long id, HttpServletResponse response) throws IOException {
        TemplateExportParams params = new TemplateExportParams(
            "import/采购入库单.xlsx");
            "import/采购入库单.xls");

        FinSysTenantUser sysInfo = this.getSysInfo();
        String userName = sysInfo.getUserName();