From 02a6c170797c5d2750ed07b21f22396a7683c54e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 15:00:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index b59de2e..62e2ce0 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -200,30 +200,4 @@
- @GetMapping("selectSmallRoutine")
- @ApiOperation("���������������")
- public ResultMessage selectSmallRoutine(@RequestParam @ApiParam(value = "state",name = "������") Integer state,
- @RequestParam @ApiParam(value = "startTime",name = "������������") String startTime,
- @RequestParam @ApiParam(value = "endTime",name = "������������") String endTime){
- List<AllocationFindVo> allocationFindVos = allocationService.selectSmallRoutine(state,startTime,endTime);
- return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
- }
-
-
- @PostMapping("changeRoutine")
- @ApiOperation("���������������")
- public ResultMessage changeSmallRoutine(@Valid @RequestBody AllocationChangeCond changeCond){
- allocationService.changeSmallRoutine(changeCond);
- return ResultMessage.ok();
- }
-
-
- @PostMapping("checkRoutine")
- @ApiOperation("���������������")
- public ResultMessage checkSmallRoutine(@Valid @RequestBody AllocationCheckCond checkCond){
- allocationService.checkSmallRoutine(checkCond);
- return ResultMessage.ok();
- }
-
-
}
--
Gitblit v1.8.0