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

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 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);
}