Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-19 4fae0a3d70ce519502c8ef17f327daffbe9a44aa

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java

@@ -1,11 +1,9 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;

import java.util.Map;
import java.util.Objects;
@@ -20,7 +18,7 @@
 */
public interface SpecificationsMapper extends BaseMapper<Specifications> {

    IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);

    Map<String, Object> selectSNameSNName(int materialId);

    IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
}