Merge remote-tracking branch 'origin/develop' into develop

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/WorkOrderQuestionRequest.java

@@ -16,7 +16,6 @@ public class WorkOrderQuestionRequest extends BaseQuery {
      */
     private String questionType;
 
-
     /**
      * 问题状态：0待处理 1已处理
      */

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/WorkOrderQuestionVO.java

@@ -9,6 +9,8 @@ import java.util.Date;
 @Data
 public class WorkOrderQuestionVO {
 
+    private String type;
+
     /**
      * 问题类型名称
      */
@@ -46,6 +48,11 @@ public class WorkOrderQuestionVO {
      */
     private Integer handlerUser;
 
+    /**
+     * 处理后图片(多个图片逗号“,”分隔)
+     */
+    private String handlerImage;
+
     /**
      * 处理人员名称
      */

tuoheng-admin/src/main/resources/mapper/WorkOrderMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="questionPage" resultType="com.tuoheng.admin.entity.vo.WorkOrderQuestionVO">
         SELECT
+        q.type,
         q.question_name AS questionName,
         q.file_original_url AS fileOriginalUrl,
         q.file_marker_url AS fileMarkerUrl,
@@ -12,6 +13,7 @@
         woq.`status` AS status,
         q.create_time AS createTime,
         qh.handler_user AS handlerUser,
+        qh.handler_image AS handlerImage,
         u.realname AS handlerUserName
         FROM th_work_order wo
         LEFT JOIN th_work_order_question  woq on wo.id = woq.work_order_id