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

admin

2019-09-26 f38e508d334ae03024f0dce0d1fb6baed212dc24

 fanli/src/main/java/com/yeshi/fanli/service/impl/ad/DouYinClickEventServiceImpl.java

@@ -31,8 +31,8 @@
   }



   @Override

   public DouYinClickEvent selectByAndroidId(String androidId) {

      return douYinClickEventDao.selectByAndroidId(androidId);

   public DouYinClickEvent selectByUuid(String uuid) {

      return douYinClickEventDao.selectByUuid(uuid);

   }



}