Merge remote-tracking branch 'origin/master'

Houjie

3 天以前 3c5205d857446563b3f89ae7432d76ba6d945a69

 src/views/system/NewPermissionList.vue

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