Commit e92c0ada by 徐高华

Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

parents 064037c3 39cad600
...@@ -28,7 +28,11 @@ import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO; ...@@ -28,7 +28,11 @@ import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO; import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
...@@ -271,7 +275,7 @@ public class WelcomeController extends WebBaseController { ...@@ -271,7 +275,7 @@ public class WelcomeController extends WebBaseController {
if (StringUtils.isBlank(welcomeId)){ if (StringUtils.isBlank(welcomeId)){
return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg()); return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg());
} }
return RestResponse.successResult(welcomeApiService.welcomeReferStatistics(welcomeId)); return RestResponse.successResult(welcomeApiService.welcomeReferStatistics(welcomeId).getResult());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment