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

gateway/pom.xml

@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-
+                <version>3.8.1</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -792,7 +792,7 @@
   </select>
   <!--维修列表-工单情况（未派单，处理中）-->
   <select id="selectMaintainOrder" resultMap="BaseResultMap" >
-    select t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
+    select t1.id ,t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
     case when t1.order_status=0 then '未派单' when t1.order_status =1 or t1.order_status=4 then '处理中' end order_status_name,
     case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
     geo