Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 299e3b3ae10786a5b00124333a3e732009f83295

 fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTaskRecord.java

@@ -20,6 +20,10 @@
 */

@Table("yeshi_ec_integral_task_record")

public class IntegralTaskRecord implements Serializable {



   public static int STATE_WAITING_RECIEVE = 0;// 等待领取

   public static int STATE_ALREAD_RECIEVE = 1;// 已领取

   public static int STATE_INVALID = 2;// 失效

   /**

    * 

    */