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

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

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

@@ -17,13 +17,13 @@
    * @param aid

    * @return

    */

   public DouYinClickEvent selectByAid(String aid);

   public DouYinClickEvent selectByCallback(String callback);



   /**

    * 根据androidID查询

    * @param androidId

    * @return

    */

   public DouYinClickEvent selectByAndroidId(String androidId);

   public DouYinClickEvent selectByUuid(String uuid);



}