@@ -608,10 +608,7 @@ thisrow:"",
latitude: this.ruleForm.latitude,
hubHeight: this.ruleForm.hubHeight,
sightcing: this.ruleForm.sightcing,
-<<<<<<< HEAD
engineCode:this.thisrow
-=======
->>>>>>> 3bd7185b7f7775a80db9fefcddb4d0905ab712bc
};
if (valid) {
