Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceSummaryQuery.java

@@ -38,6 +38,8 @@ public class AttendanceSummaryQuery {
 
     private List<String> properties;
 
+    private List<Long> idList;
+
     public AttendanceSummaryQuery(String summaryTime) {
         this.summaryTime = summaryTime;
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -95,7 +95,7 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
         int code = VALUE_RESULT_SUCCESS;
         try {
             DeptQuery deptQuery = new DeptQuery();
-            deptQuery.setOrderColList(Arrays.asList(new OrderCol("deptName")));
+            deptQuery.setOrderColList(Arrays.asList(new OrderCol("orderNum","desc")));
             List<DeptEntity> list = this.service.find(deptQuery);
             List<DeptTreeSelect> treeSelects = this.service.buildDeptTreeSelect(list);
             model.put("result", treeSelects);