Merge remote-tracking branch 'origin/main'

This commit is contained in:
yu 2024-12-26 10:08:33 +08:00
commit c8cccaba0c

View File

@ -209,7 +209,7 @@ public class EquipmentController {
return R.success(fileList); return R.success(fileList);
} }
@RequestMapping(value = "/file/read", method = RequestMethod.POST) @RequestMapping(value = "/file/read", method = RequestMethod.GET)
public void readFile(String path, HttpServletResponse response) throws IOException { public void readFile(String path, HttpServletResponse response) throws IOException {
if (StringUtils.isBlank(path)){ if (StringUtils.isBlank(path)){
throw new ServiceException("请输入浏览的文件路径"); throw new ServiceException("请输入浏览的文件路径");