Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 efaf016bd38b2e30d3942890beacc2b50bae70d9

 src/views/system/NewPermissionList.vue

@@ -199,7 +199,7 @@
                      fn(data.children)
                    }
                  })
                } 
                }
              }
              fn(dataList)
            }