Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-web/src/main/java/com/ym/mec/web/controller/SysMessageController.java

@@ -65,6 +65,7 @@ public class SysMessageController extends BaseController {
 				return succeed(JSON.parseArray("[{\"value\":\"全部\",\"key\":\"ALL\"}," +
 						"{\"value\":\"学员信息\",\"key\":\"STUDENT\"}," +
 						"{\"value\":\"乐团信息\",\"key\":\"MUSIC\"}," +
+						"{\"value\":\"审批信息\",\"key\":\"OA\"}," +
 						"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]"));
 			}
 		}
@@ -72,6 +73,7 @@ public class SysMessageController extends BaseController {
 				"{\"value\":\"缴费信息\",\"key\":\"PAY\"}," +
 				"{\"value\":\"学员信息\",\"key\":\"STUDENT\"}," +
 				"{\"value\":\"乐团信息\",\"key\":\"MUSIC\"}," +
+				"{\"value\":\"审批信息\",\"key\":\"OA\"}," +
 				"{\"value\":\"其他\",\"key\":\"DEFAULT\"}]"));
 	}