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

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -520,7 +520,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
             query.addCriteria(Criteria.where("name").regex(pattern));
         }
-        query.with(Sort.by(Sort.Direction.DESC, "count"));
+        query.with(Sort.by(Sort.Direction.DESC, "shelvesAt"));
         // 查询总数
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         // 计算库存