Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/console/managementConsole/staff_role/userManage/index.vue

@@ -24,7 +24,7 @@
         <p >
           <span>{{ item.user_name }}</span>
           <i
-            v-if="!item.is_sub_admin && org_creator != item.user_id"
+            v-if="org_creator != item.user_id"
             class="iconfont icon-bianji bianji"
           ></i>
         </p>
@@ -69,7 +69,7 @@ export default {
       });
     },
     goEditStaff: function(id,is_sub_admin) {
-      if (!is_sub_admin && org_creator != id){
+      if (this.org_creator != id){
         this.$router.push({ path: "/staff/editstaff?id=" + id });
       }
     },