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

liyong

3 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

 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>