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

liyong

4 天以前 e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831

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