Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

@@ -353,6 +353,8 @@ public class WxFinanceServiceImpl implements WxFinanceService {
 		for (int i = 0 ; i < bills.size() ; i ++) {
 			WxAllBill be = bills.get(i);
 			be.setSetOffDetailList(null);
+			be.setCurrentReceive(null);
+			be.setCurrentSetOff(null);
 			WxAllBill bill = wxBillAllHelper.getBillDetail(EnumBillAllType.getEnum(be.getBillType()), merchant, be.getId());
 			be.setReceivePay(bill.getReceivePay());
 			be.setPay(bill.getPay());