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

admin

2019-12-14 63d7d733938c8ea2fbb046625f1f70d6c48f8673

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

@@ -470,6 +470,7 @@
               continue;

         

            RedPackWinProgressVO progressVO = new RedPackWinProgressVO();

            progressVO.setUid(userInfo.getId());

            progressVO.setName(userInfo.getNickName());

            progressVO.setPortrait(userInfo.getPortrait());

            progressVO.setMoney(win.getMoney().setScale(2).toString());