Merge remote-tracking branch 'origin/master'

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/DaZsdaServiceImpl.java

@@ -86,7 +86,7 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
-			int size = rep.findAll().size() ;
+			int size = rep.findAlla().size() ;
 			Integer startPage = (pageNum-1) * pageSize;
 			List<DaZsda> all = rep.findAll(name,startPage,pageSize);
 			map.put("total",size);