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

yujian

2020-04-16 c57f9a24c525aa557225b663fa55120a36f99735

 fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java

@@ -125,7 +125,7 @@
      query.addCriteria(Criteria.where("startTime").lte(now));
      query.addCriteria(Criteria.where("endTime").gte(now));
        query.skip(start).limit(count);
      query.with(new Sort(Sort.Direction.DESC,"weight")).with(new Sort(Sort.Direction.DESC,"createTime"));
      query.with(new Sort(Sort.Direction.DESC,"weight")).with(new Sort(Sort.Direction.DESC,"startTime"));
      return mongoTemplate.find(query, GoodsEvaluate.class);
   }