Merge remote-tracking branch 'origin/master'

ui/src/views/plant/staffmgr/index.vue

@@ -763,7 +763,7 @@
           specialDuty: null
         },
         querypIdParams: {
-          units: '10,18',
+          units: '10,18,20',
         },
         educations: [],
         units: [],