suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/feat/partner1.6_20231226' into pre

Browse Source
This commit is contained in:
苏竹红
2023-12-19 19:03:17 +08:00
parent eb8e6eb84a 70b7c5fd3b
commit 62e4bb5d07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java
View File

@@ -45,12 +45,12 @@ public class ExhibitionController {
@GetMapping(value = "/getMyExhibitionList")
@ApiOperation("我的会销")
public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedTye") String closedTye,
public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedType") String closedType,
@RequestParam(required = false,value = "startDate") String startDate,
@RequestParam(required = false,value = "pageNum") Integer pageNum,
@RequestParam(required = false,value = "pageSize") Integer pageSize) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedTye,startDate,pageSize,pageNum));
return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedType,startDate,pageSize,pageNum));
}
@GetMapping(value = "/getMyExhibitionGroupList")