Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

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

@@ -125,7 +125,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         List<Object> list = new ArrayList<>();
-        list.add(new SysUserImportVo("测试部门", "测试用户昵称", "18888888888", "测试角色"));
+        list.add(new SysUserImportVo("测试组织", "测试用户昵称", "18888888888", "测试角色"));
         ExcelUtil.exportTemplate(list, "用户数据", "excel/userImportTemplate.xlsx", response);
     }
 

dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserImportVo.java

@@ -21,9 +21,9 @@ public class SysUserImportVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 所属部门
+     * 所属组织
      */
-    @ExcelProperty(value = "*所属部门")
+    @ExcelProperty(value = "*所属组织")
     private String deptName;
 
     /**