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

admin

2019-09-23 0392154afd78f314386c2e6669ead9a2c89c79b4

 fanli/src/main/java/com/yeshi/fanli/service/inter/ad/DouYinClickEventService.java

@@ -24,6 +24,6 @@
    * @param androidId

    * @return

    */

   public DouYinClickEvent selectByAndroidId(String androidId);

   public DouYinClickEvent selectByUuid(String uuid);



}