解决冲突
							parent
							
								
									f74e51c446
								
							
						
					
					
						commit
						15bbd79e7d
					
				| 
						 | 
					@ -897,6 +897,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                var totalCount = visitTaskListInfo.Item1;
 | 
					                var totalCount = visitTaskListInfo.Item1;
 | 
				
			||||||
                var currentPageData = visitTaskListInfo.Item2;
 | 
					                var currentPageData = visitTaskListInfo.Item2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue