解决冲突

4c84e0b4 · edz · e186e06d · c015f331 · 4c84e0b4
Commit 4c84e0b4 authored Aug 23, 2021 by edz
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

recommend_service.yaml test_backend_data/skin_data/recommend_service.yaml +3 -2

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]'
+    appeal_tag_ids: '[2306,2303,2551,2355,2322,2337,2252,2593]'
    device_id: "androidid_7255c3398845cdd5"
    assert_nums: 10
\ No newline at end of file