Merge branch 'dev_up' into shibei_master

# Conflicts: # src/views/modules/communityService/shzz/cpts/edit.vue
4 years ago · 7753591c4e
1 changed files with 0 additions and 1 deletions
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@ -366,7 +366,6 @@ export default {
    },
    //加载网格
    async loadStaff() {
-      //const url = "/data/aggregator/org/stafflist";
      const url = "/data/aggregator/org/currentOrgStafflist";

      let params = {