Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -4,11 +4,12 @@ package com.management.platform.controller;
 import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -25,14 +26,12 @@ public class UserController {
 
     /**
      * 管理员登录网页端
-     *
-     * @param username  用户名
-     * @param password  密码
+     * @param map
      * @return
      */
     @RequestMapping("/login")
-    public HttpRespMsg login(@RequestParam String username, @RequestParam String password){
-        return userService.login(username, password);
+    public HttpRespMsg login(@RequestBody Map<String,Object> map){
+        return userService.login((String)map.get("username"), (String)map.get("password"));
     }
 }