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

Merge #121 into master from cc_20260511_fix

Browse Source 
feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (3 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/121
This commit is contained in:
正新
2026-05-11 04:15:31 +00:00
parent 162674c0b2
commit fd43c2c4b2
10 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ToDoController.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.point.RentContractToDoPagerRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PointService;
import com.cool.store.vo.point.PointToDoVO;
@@ -36,9 +37,8 @@ public class ToDoController {
@ApiOperation("上传租赁合同待办")
@PostMapping("/getRentContractToDoPage")
public ResponseResult<PageInfo<RentInfoToDoVO>> getRentContractToDoPage(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize){
public ResponseResult<PageInfo<RentInfoToDoVO>> getRentContractToDoPage(@RequestBody RentContractToDoPagerRequest request){
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(pointService.getRentContractToDoPage(userId, pageNumber, pageSize));
return ResponseResult.success(pointService.getRentContractToDoPage(userId, request.getPageNum(), request.getPageSize(),request.getKeyword()));
}
}