web2问题解决

3d603de3 · 陈雪 · 72053e31 · 3d603de3
Commit 3d603de3 authored Jun 11, 2021 by 陈雪
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

web2_request.yaml all_doctor_api/web2_request.yaml +2 -3

No files found.
--- a/all_doctor_api/web2_request.yaml
+++ b/all_doctor_api/web2_request.yaml
@@ -55,9 +55,9 @@ service_delete:
  isLogin: 1


-<<<<<<< HEAD

-=======
+
+
 service_deletelist:
   method: get
   url: /api/web2/service/delete/list
@@ -66,4 +66,3 @@ service_deletelist:
   data: {}
   json: {}
   isLogin: 1
->>>>>>> xue_dev