Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

@@ -34,9 +34,9 @@
 			c.mobile,
 			s.`name` AS salesCompany
 		FROM
-			as_customer_vehicle AS v
-				LEFT JOIN anrui_crm.crm_customer_temp AS c ON v.customerSid = c.sid
-				LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid
+		as_customer_vehicle AS v
+		LEFT JOIN anrui_crm.crm_customer_temp AS c ON v.customerSid =  c.sid
+		LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -231,6 +231,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("v.vinNo", query.getVinNo());
         }
+        qw.orderByDesc("v.id");
         IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
         IPage<AsCustomerCrmVehVo> pagging = baseMapper.customerList(page, qw);
         PagerVo<AsCustomerCrmVehVo> p = PagerUtil.pageToVo(pagging, null);