Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -164,7 +164,6 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                             .eq(QuestionType::getMark, 1));
                     inspectionFile.setQuestionId(questionType.getId());
                 }
-
                 // 问题名称
                 inspectionFile.setQuestionName(questionFile.getQuestionName());
                 inspectionFile.setTenantId(inspection.getTenantId());

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionFileMapper.xml

@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 批量新增问题图片 -->
     <insert id="addBatch" parameterType="com.tuoheng.admin.entity.InspectionFile">
         insert into th_inspection_file (id,file_code, inspection_id, file_type, file_name,
-        file_thumbnail, file_original, file_image, file_size, latitude, longitude, `location`, gaode_longitude, gaode_latitude,
+        file_thumbnail, file_original, file_image, file_size, latitude, longitude, `location`, gaode_longitude, gaode_latitude,question_id,
         gaode_address, `source`, question_code, question_name, question_desc, `status`, check_user, check_time, create_user, tenant_id)
         values
         <foreach collection="list" item="item" separator=",">
@@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.location,jdbcType=VARCHAR},
             #{item.gaodeLongitude,jdbcType=VARCHAR},
             #{item.gaodeLatitude,jdbcType=VARCHAR},
+            #{item.questionId,jdbcType=VARCHAR},
             #{item.gaodeAddress,jdbcType=VARCHAR},
             #{item.source,jdbcType=BOOLEAN},
             #{item.questionCode,jdbcType=VARCHAR},