Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

10 天以前 da30bfc3795305f0bbd400d196bcf4c30612c37f

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java

@@ -6,6 +6,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import org.apache.ibatis.annotations.Param;

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

/**
@@ -18,6 +19,6 @@

    DailyProductionVO queryEdgDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("deviceId") Integer deviceId);

    List<RunTime> queryRunTimes();
    List<RunTime> queryRunTimes(@Param("days") String days);
}