Merge branch 'master' of http://123.57.51.87:40003/xiaojia/maintenance

application/admin/view/department/admin/index.html

@@ -112,7 +112,7 @@
 
                                 <a href="javascript:;" class="btn btn-success btn-export " title="导出" ><i class="fa fa-download"></i> 导出</a>
 
-                                <a href="../../demo.xlsx" download="demo.xlsx" class="btn btn-default"><i class="fa fa-download"></i> 导入模板</a>
+                                <a href="../../demo.xlsx" download="demo.xlsx" class="btn btn-default"><i class="fa fa-download"></i> 模板下载</a>
 
                                 <div class="dropdown btn-group {:$auth->check('department/admin/multi')?'':'hide'}">
                                     <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>

public/assets/js/backend/department/admin.js

@@ -171,6 +171,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [columnss],
                 //启用固定列
                 fixedColumns: true,
+                sortName: 'username',
+                sortOrder:'asc',
                 //固定右侧列数
                 fixedRightNumber: 1,
                 search:false,