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

src/main/java/org/rcisoft/integration/jieLink/dto/VisitDataInviteDto.java

@@ -2,6 +2,9 @@ package org.rcisoft.integration.jieLink.dto;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 邀访记录主表
  */
@@ -57,4 +60,11 @@ public class VisitDataInviteDto {
      */
     private String content;
 
+    /**
+     * <pre>
+     *     设备区域列表
+     * </pre>
+     */
+    private List<Map<String,String>> deviceApList;
+
 }

src/main/resources/application-dev-conf.yml

@@ -90,3 +90,7 @@ wx:
   appId: wx16cfb2d12e4ab57c
   secret: 37556072ad536b8d9d6cf5fb638fec88
   timeOut: 3600
+jieLink:
+  apiUrl: http://192.168.18.192:8091
+  account: 9999
+  pwd: 123456
\ No newline at end of file

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -168,10 +168,10 @@
                 vi.create_date desc
             </if>
             <if test="entity.sort == '1'.toString()">
-                vi.create_date
+                vi.create_date desc
             </if>
             <if test="entity.sort == '2'.toString()">
-                vi.visit_date
+                vi.visit_real_time desc
             </if>
         </if>
     </select>