Merge branch 'dev_ALlen' into dev-rmd

meas-system/src/main/resources/mapper/meas/MeasThermalImagerTestDataMapper.xml

@@ -14,7 +14,6 @@
         <result property="engineStatus" column="measurement_batch"/>
         <result property="angle" column="angle"/>
         <result property="model" column="model"/>
-        <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
         <result property="filterNo" column="filter_no"/>
         <result property="fps" column="fps"/>

meas-system/src/main/resources/mapper/meas/MeasTransmissionRateMapper.xml

@@ -7,6 +7,12 @@
     <resultMap type="MeasTransmissionRate" id="MeasTransmissionRateResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
+        <result property="engineModel" column="engine_model"/>
+        <result property="geometryFiles" column="geometry_files"/>
+        <result property="geometryImage" column="geometry_image"/>
+        <result property="measurementBatch" column="measurement_batch"/>
+        <result property="engineStatus" column="measurement_batch"/>
+        <result property="angle" column="angle"/>
         <result property="rawData" column="raw_data"/>
         <result property="curve1" column="curve_1"/>
         <result property="curve2" column="curve_2"/>