Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

 screen-api/src/main/java/com/moral/api/controller/ExcelController.java

@@ -150,4 +150,20 @@
    }


    /**
     * 天数据补充
     * @param request
     * @return
     * @throws IOException
     */
    @PostMapping("rexcelImport")
    public ResultMessage rexcelImport(HttpServletRequest request) throws IOException {

        List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");

        excelService.rexcelImport(files);
        return ResultMessage.ok(1);
    }


}