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

yaowanxin

昨天 2be90eb75452c8f0820d89cb1cd018dd86a351e0

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

@@ -15,5 +15,5 @@

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

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