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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

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

@@ -398,8 +398,8 @@
      List<Criteria> list = new ArrayList<Criteria>();
      list.add(Criteria.where("dynamicType").is(1));
      list.add(Criteria.where("state").is(1));
      list.add(Criteria.where("imgList.goods.goodsId").is(goodsId));
      list.add(Criteria.where("imgList.goods.goodsType").is(goodsType));
      list.add(Criteria.where("goods.goodsId").is(goodsId));
      list.add(Criteria.where("goods.goodsType").is(goodsType));
      // 限制时间内
      list.add(Criteria.where("startTime").gte(limitTime));