Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-09-01 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7

 screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java

@@ -18,11 +18,6 @@
 */
public interface HistoryHourlyMapper extends BaseMapper<HistoryHourly> {

    void insertHistoryHourlyUnAdjust(Map<String, Object> params);
    void insertHistoryHourly(Map<String, Object> params);

    int getCountByMacAndTime(@Param("mac") String mac, @Param("time") String time);

    void insertHistoryHourlyTransition(Map<String, Object> params);

    void updateHistoryTransition(@Param("mac") String mac, @Param("time") String time);
}