Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart-office-platform

smart-office-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -90,9 +90,9 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
 
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
             ArrayList<OrderCol> orderCols = new ArrayList<>();
-            OrderCol orderCol = new OrderCol("roomId", OrderCol.ASCENDING);
+            OrderCol orderCol = new OrderCol("order", OrderCol.DESCENDING);
             orderCols.add(orderCol);
-            orderCol = new OrderCol("order", OrderCol.DESCENDING);
+            orderCol = new OrderCol("roomId", OrderCol.ASCENDING);
             orderCols.add(orderCol);
             query.setOrderColList(orderCols);
         }