pengcheng 3 тижнів тому
батько
коміт
de4214a5bd

+ 2 - 1
ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiClockRecordController.java

@@ -144,7 +144,8 @@ public class ApiClockRecordController extends AbstractApiController {
     @GetMapping("/calendar")
     public R<List<ClockCalendarDayVo>> calendar(@Validated(QueryGroup.class) ClockCalendarBo bo) {
         Long employeeId = getUserId();
-        return R.ok(iClockRecordService.queryCalendar(bo, employeeId));
+        List<ClockCalendarDayVo> list = iClockRecordService.queryCalendar(bo, employeeId);
+        return R.ok(list);
     }
 
 }

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/clock/domain/ClockRecord.java

@@ -2,6 +2,7 @@ package com.ruoyi.clock.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import java.io.Serializable;