Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FuelFillingInfoServiceImpl.java

@@ -106,6 +106,7 @@ public class FuelFillingInfoServiceImpl extends ServiceImpl<FuelFillingInfoMappe
                 //行程状态改为已结束
                 fuelFillingInfo1.setTravelStatusFlag(StatusEnum.TRACK_END.getFlag());
                 fuelFillingInfo1.setTravelStatus(StatusEnum.TRACK_END.getName());
+                fuelFillingInfo1.setCarNo(fuelFillingInfo.getCarNo());
                 fuelFillingInfo1.setDestinationProvince(fuelFillingInfo.getDestinationProvince());
                 fuelFillingInfo1.setDestinationCity(fuelFillingInfo.getDestinationCity());
                 fuelFillingInfo1.setDestinationArea(fuelFillingInfo.getDestinationArea());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FuelFillingInfoMapper.xml

@@ -81,7 +81,7 @@
             </if>
         </if>
         GROUP BY ff.id
-        ORDER BY ff.create_date DESC
+        ORDER BY ff.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>