Merge remote-tracking branch 'origin/dev' into authority

src/main/java/com/uas/platform/b2b/controller/PurcProductController.java

@@ -370,7 +370,7 @@ public class PurcProductController {
 	 */
 	@RequestMapping(value = "/edit/delete", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap deleteById(Long id) throws Exception {
+	public ModelMap deleteById(@RequestBody Long id) throws Exception {
 		ModelMap map = new ModelMap();
 		try {
 			baseInfoService.deleteById(id);