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

gongchunyi

昨天 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

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

@@ -12,5 +12,8 @@

@Mapper
public interface ProductStructureMapper  extends BaseMapper<ProductStructure> {
    List<ProductStructureDto> listByproductModelId(@Param("productModelId") Long productModelId);

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

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