Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java

@@ -7,6 +7,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;

import java.util.Date;
import java.util.List;

/**
@@ -21,6 +22,6 @@

    DailyProductionVO queryEdgDailyProduction(TaskHistoryRequest request);

    List<RunTime> queryRunTimes();
    List<RunTime> queryRunTimes(String days);
}