Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -58,13 +58,14 @@
                t1.saleDate,
                t1.handoverState,
                t1.handoverDate,
-               (@rank := @rank + 1) rankNo from (SELECT @rank := 0) t,(select bv.useOrgName,
+               (@rank := @rank + 1) rankNo from (SELECT @rank := 0) t,(select distinct bv.vinNo,
+                                                                                       bv.useOrgName,
                                                                                        bvoa.orgName                                    deptName,
                                                                                        bvoa.staffName,
                                                                                        bvoa.customerName,
                                                                                        bvoa.contractNo,
                                                                                        bv.modelName,
-                                                                              bv.vinNo,
+
                                                                                        bvoa.saleTypeValue                              saleType,
                                                                                        bvoa.saleDate,
                                                                                        if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState,