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

maven

昨天 bb78ea38792502cbff36c9a4486b7b12e1940615

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

@@ -13,7 +13,7 @@
@Mapper
public interface ProductStructureMapper  extends BaseMapper<ProductStructure> {

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

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