Merge branch 'test6.9.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.2

@@ -1204,6 +1204,9 @@ public class ProductServiceImpl implements ProductService {
         } else if(sort.equals("p_desc")) {
             sort = "status asc, price desc, id desc";
         }
+        if(StringUtils.isBlank(secondType)) {
+            secondType = "5,6";
+        }
         int count = storagePriceMapper.selectSecondHandListCount(storageId, secondType);
 
         JSONObject result = new JSONObject();