Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2 天以前 7a5c5250b66cc6faffbcac9e192073473c50f79f

 src/views/hrm/employee/components/select.vue

@@ -118,7 +118,7 @@
          <div>员工编号：{{ selectedItem.employeeNo || '-' }}</div>
          <div>员工姓名：{{ selectedItem.name || '-' }}</div>
          <div v-if="selectedItem.deptName">部门：{{ selectedItem.deptName }}</div>
          <div v-if="selectedItem.postName">岗位：{{ selectedItem.postName }}</div>
          <div v-if="selectedItem.postNames">岗位：{{ selectedItem.postNames }}</div>
        </div>
      </template>
      <Input