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

liyong

昨天 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

@@ -16,4 +16,7 @@
public interface ProductModelMapper extends BaseMapper<ProductModel> {

    IPage<ProductModel> listPageProductModel(Page<ProductModel> page, @Param("c") ProductModel productModel);

    ProductModel selectLatestRecord();

}