Merge remote-tracking branch 'origin/master'

jhjang

2021-12-14 fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc

 src/main/java/kr/wisestone/owl/mapper/UserMapper.java

@@ -1,5 +1,6 @@
package kr.wisestone.owl.mapper;

import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.web.condition.UserCondition;
import org.springframework.stereotype.Repository;

@@ -23,10 +24,13 @@

    List<Map<String, Object>> findByReservationNotifyTime(Map<String, Object> conditions);

    List<Map<String, Object>> findByRealTimeNotifyTime(Map<String, Object> conditions);

    List<Map<String, Object>> findByAllWorkspace(UserCondition userCondition);

    Long countByAllWorkspace(UserCondition userCondition);

    List<Map<String, Object>> findEvent();

    Long findByLevelId(Long levelId);
}