Merge branch 'dev' of http://gitlab.91isoft.com:90/wangcong/entrance_api- into dev

src/main/java/org/rcisoft/sys/visit/controller/VisitInfomationController.java

@@ -238,6 +238,6 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,
-                visitInfomationServiceImpl.importUserExcel(file,response));
+                visitInfomationServiceImpl.importUserExcel(file, response));
     }
 }

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -403,6 +403,7 @@
                 vi.visit_real_time
             </if>
         </if>
+        order by vi.visit_real_time desc
     </select>
 
     <select id="findByUser" resultType="org.rcisoft.sys.visit.entity.VisitInfoMation">