Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-28 a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26

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

@@ -24,6 +24,8 @@

    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);
@@ -31,4 +33,6 @@
    List<Map<String, Object>> findEvent();

    Long findByLevelId(Long levelId);

    Map<String, Object> findByMyLevelAndDepartment(Long id);
}