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

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -45,7 +45,7 @@
         </if>
         <if test="travelDate!=null">
             and p.start_time=#{travelDate}
-        </if> ORDER BY s.depart_time ) as `goodOrder`
+        </if> ORDER BY p.start_time DESC ) as `goodOrder`
     </select>
     <!-- 获取旅游路线id-->
      <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">