Merge branch 'dev-szl' into 'dev'

轨道动态几何尺寸容许值差管理值设置默认值 -shizhilong

See merge request !43

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

@@ -1323,18 +1323,24 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
             gaugeChange = rowRecords.get(j).get(98).toString().trim();
             if (ObjectUtil.isNotEmpty(gaugeChange)) {
                 model.setGaugeChange(gaugeChange);
+            }else{
+                model.setGaugeChange("");
             }
             //曲率变化率
             String curvatureChange = "";
             curvatureChange = rowRecords.get(j).get(111).toString().trim();
             if (ObjectUtil.isNotEmpty(curvatureChange)) {
                 model.setCurvatureChange(curvatureChange);
+            }else{
+                model.setCurvatureChange("");
             }
             //扣分标准
             String deductStandard = "";
             deductStandard = rowRecords.get(j).get(122).toString().trim();
             if (ObjectUtil.isNotEmpty(deductStandard)) {
                 model.setDeductStandard(deductStandard);
+            }else{
+                model.setDeductStandard("");
             }
             movementDiferenceManagerList.add(model);
         }