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

admin

2019-12-28 1c8b5d11b68e727ef5ccc130327e2400f937321b

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -479,7 +479,7 @@
                  Long uid = its.next();

                  if (userSubMoneyMap.get(uid) != null) {

                     // 减去维权资金

                     userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));

                     userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));														
                  }

               }

            }