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

maven

5 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

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

@@ -13,6 +13,7 @@
        <result column="tenant_id" property="tenantId" />
        <result column="product_name" property="productName" />
        <result column="product_id" property="productId" />
        <result column="product_code" property="productCode" />
    </resultMap>
    <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
        select pm.*,p.product_name
@@ -28,6 +29,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>