Merge branch 'sd' of dd.tall.wiki:ccsens_wiki/ccsenscloud into sd

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -157,6 +157,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
         }
         ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
         proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1);
+        proTaskDetailExample.setOrderByClause("begin_time");
         List<ProTaskDetail> firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
         if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
             int sequence = 1;

tall/src/main/resources/application-test.yml

@@ -31,6 +31,7 @@ swagger:
   enable: true
 eureka:
   instance:
+
     ip-address: 127.0.0.1
 gatewayUrl: http://test.tall.wiki/gateway/
 smsCode: 0

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -109,6 +109,7 @@
         AND
           (c.place_location = 0 or c.id is null)
         group by s.task_detail_id
+        ORDER BY s.begin_time
     </select>