Merge branch 'dev' into dev.caojiawei

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -281,7 +281,7 @@ public class SysUserController extends BaseController {
      */
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:user:export")
-    @GetMapping("/export/password")
+    @PostMapping("/export/password")
     public void exportPassword(@NotNull Long deptId, HttpServletResponse response) {
         List<SysUserPassWordExportVo> listVo = userService.selectUserpassWordListByDept(deptId);
         ExcelUtil.exportExcel(listVo, "用户密码", SysUserPassWordExportVo.class, response);

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -68,6 +68,7 @@
                u.dept_id,
                u.nick_name,
                u.user_name,
+               u.user_type,
                u.email,
                u.avatar,
                u.phonenumber,