Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/NameCircle.vue

src/views/workflow/process/common/AvatarEllipsis.vue

@@ -7,7 +7,7 @@
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
         <div class="user">
           <div class="circle-user">
-            <Tooltip :content="user.name" placement="bottom-start" width="45px">
+            <Tooltip :content="user.name" placement="bottom-start" width="45">
             </Tooltip>
           </div>
           <div v-if="user.icon && mode === 'preview'"

src/views/workflow/process/nodes/CcNode.vue

@@ -2,7 +2,7 @@
   <node :title="config.name" :show-error="showError" :select-user="selectUser" :mode="mode" :content="content"
         :node-id="config.id"
         :error-info="errorInfo"
-        :show-avatar="config.props.assignedType === 'ASSIGN_USER'" :user-info="config.props.assignedUser"
+        :show-avatar="config.props.assignedType === 'ASSIGN_USER'" :user-info="config.props.assignedUser" nodeType="carbonCopyRecipient"
         @selected="emit('selected')" @delNode="emit('delNode')" @insertNode="type => emit('insertNode', type)"
         placeholder="请设置抄送人" :header-bgc="headerBgc" :header-icon="Promotion"/>
 </template>