Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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

@@ -40,4 +40,10 @@
//
//    Map<String,Object> getDataByMac(@Param("mac") String mac,@Param("time") String time,@Param("yearAndMonth") String yearAndMonth);
    void insertHistoryHourly(Map<String, Object> params);

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

    List<HistoryHourly> listResult(Map<String, Object> params);

    List<HistoryHourly> listLikeResult(Map<String, Object> params);
}