Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -247,6 +247,8 @@
        for(int i = 0;i<list.size();i++){
            AllocationExcelExt excelExt = list.get(i);
            AllocationListExcelVo item = AllocationListExcelVo.convert(excelExt);
            String stateStr = Objects.nonNull(excelExt.getState())?AllocationApproveEnum.getByValue(excelExt.getState()).getName():"未找到状态";
            item.setStateStr(stateStr);
            List<String> urls = new ArrayList<>();
            for(FileAddressVo z : excelExt.getFileBaseList()){
                urls.add(handleFileRealPath(z.getFileAddress()));