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

This commit is contained in:
sliang 2023-12-23 11:03:21 +08:00
commit 18a5ba85e9
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; import java.util.List;
/** /**
* @description 退料申请 * @description 退料申请--后台
* @author hay * @author hay
* @date 2023/12/20 11:46 * @date 2023/12/20 11:46
*/ */
@ -34,11 +34,11 @@ public class BackApplyController extends BaseController {
*/ */
@ApiOperation(value = "获取退料审核列表") @ApiOperation(value = "获取退料审核列表")
@GetMapping("/getBackApplyList") @GetMapping("/getBackApplyList")
public TableDataInfo getBackApplyList(@RequestBody BackApplyInfo bean) public AjaxResult getBackApplyList(BackApplyInfo bean)
{ {
startPage(); startPage();
List<BackApplyInfo> list = backApplyService.getBackApplyList(bean); List<BackApplyInfo> list = backApplyService.getBackApplyList(bean);
return getDataTable(list); return AjaxResult.success(getDataTable(list));
} }
@ApiOperation(value = "在用设备类型树") @ApiOperation(value = "在用设备类型树")