Merge branch 'feature/4月-菜单和权限' into dev

# Conflicts:
#	src/components/common/gic-select-group.vue

src/components/common/gic-select-group.vue

@@ -236,6 +236,9 @@ export default {
               that.$forceUpdate();
             }
           }
+          if (resData.errorCode != 1 && resData.errorCode != 10031) {
+            errMsg.errorMsg(resData);
+          }
         })
         .catch(function(error) {});
     }