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

Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
俞扬
2023-08-21 20:13:34 +08:00
parent 23cd5424e4 d67369aeff
commit 91de6d9e70
10 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -196,7 +196,7 @@ public class DeskController {
@PostMapping(path = "/transferInvestmentManager")
@ApiOperation("转让招商经理")
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException {
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request ));
return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request,Boolean.TRUE ));
}
@PostMapping(path = "/batchTransferInvestmentManager")

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
View File

@@ -48,7 +48,7 @@ public class LabelGroupController {
@ApiOperation("修改标签组")
@PostMapping({"/edit"})
public ResponseResult updateLabelGroup(@RequestBody LabelGroupUpdateDTO dto) {
public ResponseResult updateLabelGroup(@RequestBody LabelGroupUpdateDTO dto) throws ApiException {
labelGroupService.updateLabelGroup(dto);
return ResponseResult.success();
}