Merge branch 'dev-szl' into 'dev'

道岔使用情况检查导入逻辑更新 -shizhilong

See merge request !50

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RecordsMasterCheckController.java

@@ -536,7 +536,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         String ten = "";
         ten = rowRecords.get(i).get(10).toString().trim();
         if (ObjectUtil.isNotEmpty(ten)) {
-            model.setNumTen(two);
+            model.setNumTen(ten);
         }
         String tenOne = "";
         tenOne = rowRecords.get(i).get(11).toString().trim();