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

admin

2020-06-11 6ceb751e2889a5b2910dee806b5c6b2f7653077a

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

 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);

                }

            }

        }