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

@@ -33,7 +33,7 @@
         </div>
         </div>
         <div>
         <div>
             <input class="btn btn-warning radius" type="reset" value="重置搜索">
             <input class="btn btn-warning radius" type="reset" value="重置搜索">
-            <button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button>
+<!--            <button class="btn btn-primary radius" type="button" onclick="add()">添加角色</button>-->
         </div>
         </div>
     </form>
     </form>
 
 

@@ -91,7 +91,8 @@
         newData['DepartmentVO'] = {
         newData['DepartmentVO'] = {
             children:data['children']
             children:data['children']
         };
         };
-
+        console.log(JSON.stringify(newData));
+        return false;
         $.ajax({
         $.ajax({
             type: 'post',
             type: 'post',
             url: apiBaseUrl + targetUrl,
             url: apiBaseUrl + targetUrl,