Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/service/HistoryDailyService.java

@@ -9,4 +9,6 @@
    Map getOverproofData(Map<String, Object> parameters) throws Exception;



    Map<String, Double> getTraceabilityData(Map<String, Object> parameters) throws Exception;



    List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;

}