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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackBalanceServiceImpl.java

@@ -36,8 +36,7 @@
      

      RedPackBalance redPackBalance = redPackBalanceMapper.selectByPrimaryKey(uid);

      if (redPackBalance != null)

         return redPackBalance.getMoney();

		
         return redPackBalance.getMoney();
      return new BigDecimal(0);

   }