Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

 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;

}