Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	docker.sh

docker.sh

@@ -12,5 +12,5 @@ docker rmi smartopsweb:latest
 echo '----build image start----'
 docker build -t smartopsweb:latest .
 echo '----build image success----'
-docker run --name smartopsweb --restart=always -d -p 8080:80 smartopsweb:latest
+docker run --name smartopsweb --restart=always -d -p 28081:80 smartopsweb:latest
 

src/views/system/role/DistributeUser.vue

@@ -320,9 +320,15 @@ const handleDialogSelect = (selection) => {
   }
 }
 const handleSubmit = (userIds) => {
+  let ids=[]
+  if(userIds instanceof Array){
+    ids=userIds
+  }else{
+    ids.push(userIds)
+  }
   roleBindUser({
     id: roleId,
-    ids: userIds,
+    ids: ids,
   }).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg);