Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/InspectionFileController.java

@@ -120,8 +120,8 @@ public class InspectionFileController {
      * 修改巡检任务问题类型
      */
     @PutMapping("/edit/question/{id}/{questionCode}")
-    public JsonResult editQuestionTyppe(@PathVariable("id") String id, @PathVariable("questionCode") String questionCode) {
+    public JsonResult editQuestionType(@PathVariable("id") String id, @PathVariable("questionCode") String questionCode) {
         log.info("进入修改问题类型接口, id={}, questionCode={}", id, questionCode);
-        return iInspectionFileService.editQuestionTyppe(id, questionCode);
+        return iInspectionFileService.editQuestionType(id, questionCode);
     }
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFileDistributionListRequest.java

@@ -20,7 +20,7 @@ public class QueryInspectionFileDistributionListRequest {
     private String inspectionName;
 
     /**
-     * 问题类型
+     * 问题编号
      */
     private String questionCode;
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/IInspectionFileService.java

@@ -97,5 +97,5 @@ public interface IInspectionFileService {
      *
      * @return
      */
-    JsonResult editQuestionTyppe(String id, String questionCode);
+    JsonResult editQuestionType(String id, String questionCode);
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java

@@ -419,7 +419,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
      * @return
      */
     @Override
-    public JsonResult editQuestionTyppe(String id, String questionCode) {
+    public JsonResult editQuestionType(String id, String questionCode) {
         return updateInspectionFileQuestionTypeService.update(id, questionCode);
     }
 }