Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -682,6 +682,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                         NullPointerException nullPointerException = new NullPointerException();
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
+                    String inPut = temp.trim();
                     for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
@@ -690,16 +691,16 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                                     rowList.add(String.valueOf(r + 1));
                                     break;
                                 case 1:
-                                    importVo.setVehicleTypeCode(temp);
+                                    importVo.setVehicleTypeCode(inPut);
                                     break;
                                 case 2:
-                                    importVo.setConfigCode(temp);
+                                    importVo.setConfigCode(inPut);
                                     break;
                                 case 3:
-                                    importVo.setGuidedPrice(temp);
+                                    importVo.setGuidedPrice(inPut);
                                     break;
                                 case 4:
-                                    importVo.setManufactorSettlementPrice(temp);
+                                    importVo.setManufactorSettlementPrice(inPut);
                                     break;
                                 default:
                                     break;
@@ -938,4 +939,4 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         return true;
     }
 
-}
+}