Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang

 Conflicts:

	ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java

ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java

@@ -119,7 +119,7 @@ public class MachineController {
     public Result changeStatus(@PathVariable("id") Long id){
         machineService.changeStatus(id);
 
-        return new Result();
+        return new Result().ok(true);
     }
 
 }