Merge remote-tracking branch 'origin/master'

src/main/java/com/zzjee/api/wmomController.java

@@ -49,7 +49,8 @@ import io.swagger.annotations.ApiParam;
  */
 @Controller
 @RequestMapping("/wmom")
-public class wmomController {
+public class
+wmomController {
 	private static final Logger logger = Logger.getLogger(wmomController.class);
 //	@Autowired
 //	private UserService userService;

src/main/java/com/zzjee/wm/controller/WmOmQmIController.java

@@ -385,7 +385,7 @@ public class WmOmQmIController extends BaseController {
 
 	@RequestMapping(params = "dotowavedown")
 	@ResponseBody
-	public AjaxJson dotowavedown(HttpServletRequest request) {
+	public synchronized AjaxJson dotowavedown(HttpServletRequest request) {
 		String message = null;
 		AjaxJson j = new AjaxJson();
 		message = "下架成功";
@@ -444,7 +444,7 @@ public class WmOmQmIController extends BaseController {
 
 	@RequestMapping(params = "dotodown")
 	@ResponseBody
-	public AjaxJson dotodown(HttpServletRequest request) {
+	public synchronized AjaxJson dotodown(HttpServletRequest request) {
 		String message = null;
 		AjaxJson j = new AjaxJson();
 		message = "下架成功";

src/main/java/com/zzjee/wm/controller/WmToDownGoodsController.java

@@ -726,7 +726,7 @@ public class WmToDownGoodsController extends BaseController {
 	//下架
 	@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
 	@ResponseBody
-	public ResponseEntity<?> create(@RequestParam String wmToDownGoodsstr,
+	public synchronized ResponseEntity<?> create(@RequestParam String wmToDownGoodsstr,
 			UriComponentsBuilder uriBuilder) {
 		ResultDO D0 = new  ResultDO();
 		WmToDownGoodsEntity wmToDownGoods  = (WmToDownGoodsEntity)JSONHelper.json2Object(wmToDownGoodsstr,WmToDownGoodsEntity.class);
@@ -812,7 +812,7 @@ public class WmToDownGoodsController extends BaseController {
 	//装车复核
 	@RequestMapping(value = "/change", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
 	@ResponseBody
-	public ResponseEntity<?> update(@RequestParam String wmToDownGoodsstr,
+	public  ResponseEntity<?> update(@RequestParam String wmToDownGoodsstr,
 									UriComponentsBuilder uriBuilder) {
 		// 调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
 		ResultDO D0 = new  ResultDO();