Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -159,7 +159,7 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
             List<WorkOrderQuestion> workOrderQuestions = workOrderQuestionMapper.selectList(new LambdaQueryWrapper<WorkOrderQuestion>()
                     .eq(WorkOrderQuestion::getQuestionId, id));
             if(StringUtils.isNotEmpty(workOrderQuestions)){
-                return JsonResult.error("问题:"+id+"已生成工单，无法修改！");
+                return JsonResult.error("问题已生成工单，无法修改！");
             }
         }
 

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/WorkOrderServiceImpl.java

@@ -158,7 +158,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 .eq(WorkOrderQuestion::getStatus, 1)
                 .eq(WorkOrderQuestion::getMark, MarkTypeEnum.VALID.getCode()));
         if(handleCount > 0){
-            return JsonResult.error("问题"+request.getQuestionId()+"已经处理，无法再处理");
+            return JsonResult.error("问题已经处理，无法再处理");
         }
 
         //将工单子表状态修改为已处理