Authored by DengXinFei

Merge branch 'test' of git.dev.yoho.cn:yoho30/yohobuy-union into test

@@ -38,7 +38,7 @@ public class ActivateUnionRest { @@ -38,7 +38,7 @@ public class ActivateUnionRest {
38 /** 38 /**
39 * 激活联盟 39 * 激活联盟
40 * @param request 40 * @param request
41 - * @return 41 + * @return
42 */ 42 */
43 @RequestMapping("/activateUnion") 43 @RequestMapping("/activateUnion")
44 @ResponseBody public ActiveUnionResponseBO activateUnion(ActivateUnionRequestVO vo) { 44 @ResponseBody public ActiveUnionResponseBO activateUnion(ActivateUnionRequestVO vo) {