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

This commit is contained in:
dingjie 2023-12-23 11:45:53 +08:00
commit d3f7052535
1 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @description 退料申请
* @description 退料申请--后台
* @author hay
* @date 2023/12/20 11:46
*/
@ -34,11 +34,11 @@ public class BackApplyController extends BaseController {
*/
@ApiOperation(value = "获取退料审核列表")
@GetMapping("/getBackApplyList")
public TableDataInfo getBackApplyList(@RequestBody BackApplyInfo bean)
public AjaxResult getBackApplyList(BackApplyInfo bean)
{
startPage();
List<BackApplyInfo> list = backApplyService.getBackApplyList(bean);
return getDataTable(list);
return AjaxResult.success(getDataTable(list));
}
@ApiOperation(value = "在用设备类型树")