Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

昨天 372d212912401059defe5fe83379c50d1033c06e

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

@@ -134,7 +134,7 @@
        <include refid="ProductionOrderVoColumns" />
        <include refid="ProductionOrderVoFrom" />
        <include refid="ProductionOrderWhere" />
        order by po.id desc
        order by po.nps_no desc
    </select>

    <select id="listProductionOrder" resultMap="ProductionOrderVoResultMap">
@@ -232,7 +232,7 @@
                and po.create_time &lt; #{endTime}
            </if>
        </where>
        order by po.id desc
        order by po.nps_no desc
        limit #{offset}, #{size}
    </select>