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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java

@@ -149,6 +149,14 @@
            } else {

               vo.setMoneyArrivalDesc("订单已到账后提现时间和金额均不受限制");

            }

				
            if(vo.getLastMonthSettleMoney() == null) {

               vo.setLastMonthExtractMoney(BigDecimal.ZERO);

            }

				
            if(vo.getNotSettleMoney() == null) {

               vo.setNotSettleMoney(BigDecimal.ZERO);

            }

         }

      }