Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev

颜惠青
2 parents 43690bd9 ecdb17f0
Showing 2 changed files with 3 additions and 2 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
urbanops-server/src/main/resources/application-prod.yaml
@@ -377,9 +377,10 @@
     </select>
     <!--已完成任务详情-->
     <select id="queryCompletedTaskDetails"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" >
-        -- 巡查已办理
+
         SELECT taskName, busiDateTime, pressingType
         FROM (
+            -- 巡查已办理
             SELECT B.plan_name as taskName,A.finish_time as busiDateTime, null as pressingType
             from garden_inspection_plan_commit a , garden_inspection_plan b
             where a.batch_no=b.batch_no
@@ -317,4 +317,4 @@ static:
   resource:
     server:
       enable: true
-      url: https://test.jichengshanshui.com.cn:4080/downloads/
+      url: https://giomp.jichengshanshui.com.cn:4080/downloads/