Merge branch 'feature/十月迭代' into dev

1c8563a3 · crushh · c8b06eae · 6e3b9f77 · 1c8563a3
Commit 1c8563a3 authored Oct 20, 2021 by crushh
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

new-depart-member.vue src/components/company/new-depart-member.vue +2 -2

No files found.
--- a/src/components/company/new-depart-member.vue
+++ b/src/components/company/new-depart-member.vue
@@ -133,11 +133,11 @@ export default {
        },
        {
          value: '0',
-          label: '未激活'
+          label: '未关联'
        },
        {
          value: '1',
-          label: '已激活'
+          label: '已关联'
        }
      ],
      // 分页参数