Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue

@@ -367,7 +367,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue

@@ -407,7 +407,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }

attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue

@@ -193,7 +193,7 @@ export default {
             width: 100,
             formatter: (row) => {
               if (row.check) {
-                return <span style="cursor:pointer;color:#ff0000">不选择</span>;
+                return <span style="cursor:pointer;color:#ff0000">已选中</span>;
               } else {
                 return <span style="cursor:pointer;color:#1890ff">选择</span>;
               }