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

liyong

2 天以前 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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

@@ -25,12 +25,14 @@
            <if test="c.productName != null and c.productName != ''">
                and p.product_name  like  concat('%',#{c.productName},'%')
            </if>
            <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
            </if>
        </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>