Merge branch 'v2.0' of http://8.136.199.33:3000/eta_forum/eta_forum_admin_front into v2.0

src/views/customer/user/components/ConfirmImportUser.vue

@@ -53,7 +53,7 @@ async function handleSave(){
         <span>{{row.CountryCode}}-{{row.Mobile}}</span>
       </template>
       <template #DepartmentName="{ row }">
-        <span>{{row.Position}}-{{row.DepartmentName}}</span>
+        <span>{{row.Position}}{{row.Position&&row.DepartmentName?' - ':''}}{{row.DepartmentName}}</span>
       </template>
       <template #PositionStatus="{ row }">
         <t-tag