Merge remote-tracking branch 'origin/dev' into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -244,7 +244,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         //更新主表pb_pbdamount=从表二金额合计
         Double amountTotal2 = new Double(0);
         for (Recbalancedetail detail : recbalancedetail){
-            amountTotal2 = amountTotal2 + detail.getRbd_amount();
+            amountTotal2 = amountTotal2 + detail.getRbd_nowbalance();
         }
         updateRay.setId(rec.getMain().getId());
         updateRay.setRb_rdamount(amountTotal);