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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/dao/ad/DouYinClickEventDao.java

@@ -16,9 +16,9 @@
      return findOne(query);

   }



   public DouYinClickEvent selectByAndroidId(String androidId) {

   public DouYinClickEvent selectByUuid(String uuid) {

      Query query = new Query();

      query.addCriteria(Criteria.where("androidId").is(androidId));

      query.addCriteria(Criteria.where("uuid").is(uuid));

      return findOne(query);

   }