Commit 40f8368d authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

parents 2674d435 e1428ff5
......@@ -250,7 +250,7 @@ public class CustomerBusinessContoller {
return new R(tSettleDomainService.getPage(page, vo));
}else{
}*/
return new R(tSettleDomainService.getOwnSettleDomain(page,user.getId().toString(),vo.getDepartName()));
return tSettleDomainService.getOwnSettleDomain(page,user.getId(),vo.getDepartName());
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment