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

 Conflicts:

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

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

@@ -56,7 +56,6 @@ public class FactoryController {
     //@PreAuthorize("@ex.hasAuthority('code:factory:page')")
     public Result<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<FactoryDTO> page = factoryService.page(params);
-
         return new Result<PageData<FactoryDTO>>().ok(page);
     }