Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java

@@ -1,8 +1,6 @@
package com.ruoyi.production.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProductStructure;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +11,7 @@
@Mapper
public interface ProductStructureMapper  extends BaseMapper<ProductStructure> {

    List<ProductStructureDto> listBybomId(@Param("bomId") Long bomId);
    List<ProductStructureDto> listBybomId(@Param("bomId") Integer bomId);

    List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Long bomId, @Param("processId") Long processId);
    List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Integer bomId, @Param("processId") Long processId);
}