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

liyong

昨天 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

@@ -15,7 +15,7 @@
        <result column="product_id" property="productId" />
    </resultMap>
    <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
        select pm.*,p.product_name,
        select pm.*,p.product_name
        from product_model pm
        left join product p on pm.product_id = p.id
        <where>
@@ -28,6 +28,11 @@
        </where>
        order by  pm.id
    </select>
    <select id="selectLatestRecord" resultType="com.ruoyi.basic.pojo.ProductModel">
            SELECT * FROM product_model
            ORDER BY create_time DESC, id DESC
            LIMIT 1
    </select>


</mapper>