Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

yuan

10 天以前 66d041ed14b3ed3ed7183a28a5c588e235fc21d0

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

@@ -58,7 +58,7 @@
                </if>
            </if>
        </where>
        ORDER BY COALESCE(pp.id) DESC
        ORDER BY pp.mps_no DESC
    </select>

    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">