Merge branch 'dev'

* dev:
  修复用户禁用功能的部分bug
  增加禁用用户的功能

template/src/admin/user/user_list.html

@@ -84,6 +84,10 @@
                     <label>两步验证</label>
                     <input name="tfa_auth" type="checkbox" class="form-control" ms-duplex-checked="tfa_auth">
                 </div>
+                <div class="form-group col-md-3">
+                    <label>是否禁用用户</label>
+                    <input name="is_forbidden" type="checkbox" class="form-control" ms-duplex-checked="is_forbidden">
+				</div>
             </div>
             <div class="form-group">
                 <button type="submit" class="btn btn-success">保存修改</button>
@@ -91,4 +95,4 @@
         </form>
     </div>
 </div>
-<script src="/static/js/app/admin/user/userList.js"></script>
+<script src="/static/js/app/admin/user/userList.js"></script>