Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java

@@ -7,6 +7,7 @@
import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.largenscreen.entity.PieChartVO;

import java.util.List;
import java.util.Map;
@@ -46,5 +47,7 @@

    Boolean resetCage();

    List<PieChartVO> queryPieChart();

//    List<Integer> queryFreeDeviceByNotUsed(double thickness);
}