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

# Conflicts:
#	src/main/java/com/caimei365/commodity/service/impl/SearchQueryServiceImpl.java

src/main/java/com/caimei365/commodity/components/SearchOpenService.java

@@ -140,6 +140,9 @@ public class SearchOpenService {
             Order order = (1 == sortType) ? Order.DECREASE : Order.INCREASE;
             // 设置排序字段
             sorter.addToSortFields(new SortField(sortField, order));
+        }else{
+            //走时间排序
+            sorter.addToSortFields(new SortField("a_publish_date", Order.DECREASE));//1.2.8版本根据时间排序
         }
         // 以RANK相关性算分降序
         sorter.addToSortFields(new SortField("RANK", Order.DECREASE));