解决冲突

50c7d6d2 · edz · 21650e8c · 4c84e0b4 · 50c7d6d2
Commit 50c7d6d2 authored Aug 23, 2021 by edz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

recommend_service.yaml test_backend_data/skin_data/recommend_service.yaml +1 -1

No files found.
--- a/test_backend_data/skin_data/recommend_service.yaml
+++ b/test_backend_data/skin_data/recommend_service.yaml
 recommend_service:
  -
    case: "测肤底部feed流"
-    current_city_id: "beijing"
+    current_city_id: "worldwide"
    offset: 0
    size: 10
    appeal_tag_ids: '[2306,2303,2551,2355,2322,2337]'