Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-system-qinghai into dev

src/main/java/com/chinaitop/depot/system/controller/FuncInfoController.java

@@ -70,6 +70,21 @@ public class FuncInfoController {
 		return pageInfo;
 	}
 
+	
+	
+	/**
+	 * 查找功能信息
+	 * @return
+	 */
+	@RequestMapping(value="/getFuncList", method = RequestMethod.GET)
+	@ApiOperation(value="功能列表", notes = "查询功能列表")
+	public List<FuncInfo> getFuncInfo() {
+		FuncInfoExample example = new FuncInfoExample();
+		Criteria criteria = example.createCriteria();
+		return funcInfoService.queryByExample(example);	
+	}
+	
+	
 	/**
 	 * 根据编号查找功能信息
 	 * @param funcId	编号