Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-05-21 8e89f95b9db4039f0cb8b4b8dc7974c247366c4c

 src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java

@@ -29,4 +29,6 @@
    List<Map<String, Object>> getProductAndModelList();

    List<ProductModel> selectModelListByProductIds(@NotNull @Param("ids") List<Long> ids);

    ProductModel selectOldProductModel(@Param("model") String model, @Param("productName") String productName);
}