Merge remote-tracking branch 'origin/master'

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcBalanceSheetMapper.java

@@ -140,7 +140,7 @@ public interface DcBalanceSheetMapper {
     @Select({"select finished_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
     BigDecimal getLogisticsAccountsPayableSum(@Param("date") Date date);
 
-    @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay}")
+    @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay} and company_value in (53,3,5,60,66,59,50,8,1,61,2,70)")
     BigDecimal getAmountBorrowed(@Param("lastDay") Date lastDay);
 
     int updateByPrimaryKeySelective(DcBalanceSheet record);