Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -175,7 +175,7 @@ public class SysUserController extends BaseController
     /**
      * 重置密码
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -37,7 +37,7 @@ public class GenConstants
 
     /** 数据库数字类型 */
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "float", "double", "decimal" };
+            "bit", "bigint", "float", "float", "double", "decimal" };
 
     /** 页面不需要编辑字段 */
     public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };