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

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

Browse Source
This commit is contained in:
俞扬
2023-07-03 16:52:05 +08:00
parent 63dcea0b1a 73258a339d
commit 65892130d6
10 changed files with 71 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,6 @@ public class DeskController {
@Resource
HyPartnerBaseInfoService hyPartnerBaseInfoService;
@Resource
private ISVHttpRequest isvHttpRequest;
@Resource
EnterpriseUserService enterpriseUserService;
@Resource
PartnerUserInfoService partnerUserInfoService;
@@ -78,7 +76,7 @@ public class DeskController {
public ResponseResult<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam(value = "startTime") Long startTime,
@RequestParam(value = "endTime") Long endTime) throws ApiException {
String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime));
return ResponseResult.success(deskService.getUserCalendarsEvents(userId,startTime,endTime));
}