0323

health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java

@@ -192,7 +192,7 @@ public class JourneyDto {
     }
 
     @Data
-    @ApiModel("修改异常行程信息")
+    @ApiModel("删除异常行程信息id")
     public static class DeleteAbnormalJourney {
         @NotNull
         @ApiModelProperty("id")

health/src/main/java/com/ccsens/health/bean/vo/AbnormalVo.java

@@ -41,7 +41,7 @@ public class AbnormalVo {
     }
 
     @Data
-    @ApiModel("异常人员统计")
+    @ApiModel("异常人员统计返回")
     public static class AbnormalStatisticsVo{
         @ApiModelProperty("id")
         private String id;

health/src/main/resources/mapper_dao/RealNameAuthDao.xml

@@ -21,13 +21,12 @@
             m.wkno as wkno,
             s.id as cId,
             s.site_name as cName,
-            sc.time as cTime,
+            sc.time as cTime
-            sq.out_or_in as cType
         from
             t_site s right JOIN t_site_qrcode sq on sq.site_id = s.id
-            right JOIN t_site_clock_in sc	on sc.qrcode_id = sq.id
+            right JOIN t_site_clock_in sc	on sc.site_id = s.id
             right JOIN t_real_name_auth r on sc.user_id = r.user_id
-            right join t_member m on r.no = m.wkno
+            join t_member m on r.no = m.wkno
         where
             m.rec_status = 0
         <if test="name != null">

tall/src/main/resources/application.yml

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