Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

                 .eq(InspectionFile::getId, dto.getId())
                 .eq(InspectionFile::getMark, 1)
                 .eq(StringUtils.isNotEmpty(dto.getTenantId()), InspectionFile::getTenantId, tenantId));
-        //修改对应的问题类型
+        //修改对应的问题类型和code及questionName
         inspectionFile.setQuestionId(dto.getQuestionId());
+        QuestionType questionType = questionTypeMapper.selectById(dto.getQuestionId());
+        if(ObjectUtil.isNotNull(questionType)){
+            inspectionFile.setQuestionCode(questionType.getCode());
+            inspectionFile.setQuestionName(questionType.getContent());
+        }
+
         int count = inspectionFileMapper.updateById(inspectionFile);
         if (count <= 0) {
             return JsonResult.error();