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

lty

19 小时以前 84edd2b6308fa018eab932a2db528b7e6e1e6d13

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -132,7 +132,7 @@
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        <include refid="standbyAll"></include>
<!--        <include refid="standbyAll"></include>-->
    </select>

    <select id="selectItemByOrderNo" resultMap="BaseResultMap">