Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -146,7 +146,7 @@
     }
     }
 
 
     function edit(id) {
     function edit(id) {
-        layer_show('编辑角色', '<?=site_url('perm/roleAdd');?>/'+id);
+        layer_show('编辑角色', '<?=site_url('perm/roleEdit');?>/'+id);
     }
     }
 
 
     function del(id) {
     function del(id) {