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

maven

2026-02-03 2ac14cef837ceaa5201d6266485ab672f6f3d650

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

@@ -7,6 +7,7 @@
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -26,4 +27,6 @@
    ProductModel selectLatestRecord();

    List<Map<String, Object>> getProductAndModelList();

    List<HashMap<String, Object>> listProduct();
}