Merge remote-tracking branch 'origin/master'

yujian

2019-05-20 0a51e12c7a0a4ce201d5ba8459d702d029beea19

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -161,6 +161,9 @@
   // public static final String TAOKE_ANDROID_APPKEY = "24587154";

   // public static final String TAOKE_IOS_APPKEY = "24838852";



   // 新人抽奖-最大次数

   public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;



   static {



      if (smsConfig == null) {