Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/role.json

         "is_system": 1,
         "number": 9999,
         "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
-        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55"
+        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45"
       },
       {
         "role_name": "医生",
         "is_system": 1,
         "number": 9998,
         "purview_ids": "71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-        "func_ids": ""
+        "func_ids": "1,2,3,4,5,6,7,8,9,10,11,12,24,25,26,27,28,29,30,31,32,33"
 
 
       },
         "is_system": 1,
         "number": 9997,
         "purview_ids": "74,75,73,48,52,110,93,121,122,124,125,120",
-        "func_ids": ""
+        "func_ids": "7,8,10,11,12,13,14,16,17,19,21,22,24,25,27,28"