Merge branch 'master' into 3.0

# Conflicts:
#	cost-service/src/main/java/com/blt/other/module/cost/service/impl/AppCostServiceImpl.java

cost-service/src/main/java/com/blt/other/module/cost/service/impl/AppCostServiceImpl.java

@@ -33,6 +33,8 @@ public class AppCostServiceImpl implements AppCostService {
     @Resource
     CostDao costDao;
     @Resource
+    CostService costService;
+    @Resource
     CostDetailService costDetailService;
 
     @Resource
@@ -43,6 +45,10 @@ public class AppCostServiceImpl implements AppCostService {
         IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
         costDetailService.setDetail(costDomainIPage.getRecords());
 
+        Page<CostDomain> result = costDao.appCheckCostList(costDomainIPage, req);
+        costDetailService.setDetail(result.getRecords());
+        return (Page<CostDto>) result.convert(CostDomain::castToDto);
+
 
         Page<CostDomain> result = costDao.appCheckCostList(costDomainIPage, req);
         costDetailService.setDetail(result.getRecords());