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

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/target/classes/com/management/platform/util/FileUtil.class
#	fhKeeper/formulahousekeeper/management-platform/target/classes/com/management/platform/util/ProcessUtil.class

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

@@ -4,7 +4,6 @@ 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;
@@ -32,7 +31,7 @@ public class UserController {
      * @return
      */
     @RequestMapping("/login")
-    public HttpRespMsg login(@RequestBody String username, @RequestBody String password){
+    public HttpRespMsg login(@RequestParam String username, @RequestParam String password){
         return userService.login(username, password);
     }
 }