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

yujian

2020-04-24 33a603f2c8abe311fae3c84b0e54067580cc088c

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInviteValidRecord.java

@@ -25,7 +25,7 @@
   @Column(name = "tvr_type")

   private Integer type;



   // 唯一值：( uid#workerId#type)

   // 唯一值：(workerId#type)

   @Column(name = "tvr_unique_key")

   private String uniqueKey;