Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/resources/com/steerinfo/dil/mapper/OmstrainOrderMapper.xml

@@ -631,6 +631,7 @@
                           <if test="sendStation != null">
                             and RAR.ARRIVAL_NAME  like #{sendStation}
                           </if>
+                        Order By OTO.ORDER_WAGON_NO,"OutStation"
                           )
   </select>
     <select id="getTrainOrderIds" resultType="java.math.BigDecimal" parameterType="decimal">