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

zss

3 天以前 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

 src/main/resources/mapper/production/ProductProcessMapper.xml

@@ -4,10 +4,7 @@

    <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
        SELECT
        p.id,
        p.name,
        p.no,
        p.remark
        *
        FROM
        product_process p
        <where>
@@ -18,6 +15,6 @@
                AND  p.no LIKE CONCAT('%',#{productProcessDto.no},'%')
            </if>
        </where>
        order by p.id desc
        order by p.id asc
    </select>
</mapper>