Merge branch 'feature-org-import' into 'develop'

importperson change to importorg

See merge request o2oa/o2oa!660

o2web/source/x_component_Org/lp/en.js

@@ -239,10 +239,10 @@ MWF.xApplication.Org.LP = {
     "resetPasswordText": "您确定要为用户 {name} 重置密码吗？",
     "resetPasswordSuccess": "用户 {name} 的密码已重置",
 
-    "importPersonTitle": "人员导入",
-    "importPersonInfor": "您可以通过Excel批量导入人员，<a target='_blank' href='{url}' >点击此处</a>获取人员导入模板",
-    "importPersonAction": "上传Excel文件，导入人员",
-    "importPersonResult": "人员已导入，<a target='_blank' href='{url}' >点击此处</a>查看导入结果",
+    "importPersonTitle": "组织导入",
+    "importPersonInfor": "您可以通过Excel批量导入组织，<a target='_blank' href='{url}' >点击此处</a>获取组织导入模板",
+    "importPersonAction": "上传Excel文件，导入组织",
+    "importPersonResult": "组织已导入，<a target='_blank' href='{url}' >点击此处</a>查看导入结果",
 
     "queryPrivateConfigTitle":"个人通讯录权限配置",
     "queryPrivateConfigExcludUnit":"不允许被查询单位",

o2web/source/x_component_Org/lp/zh-cn.js

@@ -241,10 +241,10 @@ MWF.xApplication.Org.LP = {
     "resetPasswordSuccess": "用户 {name} 的密码已重置",
 
     "importPersonClean": "清空人员组织数据",
-    "importPersonTitle": "人员导入",
-    "importPersonInfor": "您可以通过Excel批量导入人员，<a target='_blank' href='{url}' >点击此处</a>获取人员导入模板",
-    "importPersonAction": "上传Excel文件，导入人员",
-    "importPersonResult": "人员已导入，<a target='_blank' href='{url}' >点击此处</a>查看导入结果",
+    "importPersonTitle": "组织导入",
+    "importPersonInfor": "您可以通过Excel批量导入组织，<a target='_blank' href='{url}' >点击此处</a>获取组织导入模板",
+    "importPersonAction": "上传Excel文件，导入组织",
+    "importPersonResult": "组织已导入，<a target='_blank' href='{url}' >点击此处</a>查看导入结果",
 
     "queryPrivateConfigTitle":"个人通讯录权限配置",
     "queryPrivateConfigExcludUnit":"不允许被查询单位",