Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

20 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 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>