Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !45

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/UserController.java

 package com.alibaba.cloud.integration.order.controller;
 package com.alibaba.cloud.integration.order.controller;
 
 
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 @RestController
 @RestController
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
 public class UserController {
 public class UserController {
 
 
+	@Autowired
+	private UserService userService;
+
 	@PostMapping("/user/login")
 	@PostMapping("/user/login")
 	public Result<?> userLogin(@RequestBody String account, @RequestBody String password) {
 	public Result<?> userLogin(@RequestBody String account, @RequestBody String password) {
-		return null;
+		return  userService.userLogin(account, password);
 	}
 	}
 
 
 	@GetMapping("/user/userInfo")
 	@GetMapping("/user/userInfo")
 	public Result<?> getUserInfo(@RequestBody String userToken, @RequestBody boolean needTeamInfo) {
 	public Result<?> getUserInfo(@RequestBody String userToken, @RequestBody boolean needTeamInfo) {
-		return null;
+		return userService.getUserInfo(userToken, needTeamInfo);
 	}
 	}
 }
 }