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

gongchunyi

2026-02-13 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

 src/main/resources/mapper/basic/ProductModelMapper.xml

@@ -97,5 +97,14 @@

        ORDER BY pm.id DESC
    </select>
    <select id="getProductAndModelList" resultType="java.util.Map">
        select p.id as id,
               pm.id as modelId,
               p.product_name as productName ,
               pm.model as  model
        from product_model pm
        left join product p on p.id = pm.product_id
        order by p.id,pm.id desc
    </select>

</mapper>