Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinecabinetInventoryDao.java

@@ -6,6 +6,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository<MediicinecabinetInventory, String> {
    MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
}