Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java

@@ -92,6 +92,8 @@
         record.setUid(uid);

         record.setType(type);

         record.setCount(num);

      } else {

         record.setCount(num);

      }

      return record;

   }