Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVoExeclNew.java

@@ -21,7 +21,7 @@ public class BaseVehicleOutVoExeclNew {
     private String materialName;
     @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
     private String vinNo;
-    @ExportEntityMap(CnName = "配置", EnName = "modelConfig")
+    @ExportEntityMap(CnName = "车型(配置简述)", EnName = "modelConfig")
     private String modelConfig;
     @ExportEntityMap(CnName = "内部编码", EnName = "insideCode")
     private String insideCode;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1468,7 +1468,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 } else {
                     //修改客户简称为合同编号
                     bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
-                    bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getCustomerName() + busSalesOrderVehicle.getLinkNo());
+                    bdCustomer.setFShortName(busSalesOrderVehicle.getTemporaryName());
                     bdCustomer.setFNumber(FNumber);
                     bdCustomer.setOldFNumber(FNumber);
                     bdCustomers.add(bdCustomer);