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

admin

2020-03-15 b16f2b0126281e87346db9e6efd1db960ecc872a

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

@@ -157,8 +157,8 @@
      Query query = new Query();
      query.addCriteria(Criteria.where("dynamicType").is(1));
      query.addCriteria(Criteria.where("state").is(1));
      query.addCriteria(Criteria.where("goods.goodsId").is(goodsId));
      query.addCriteria(Criteria.where("goods.goodsType").is(goodsType));
      query.addCriteria(Criteria.where("imgList.goods.goodsId").is(goodsId));
      query.addCriteria(Criteria.where("imgList.goods.goodsType").is(goodsType));
      return mongoTemplate.find(query, GoodsEvaluate.class);
   }