Commit adc66539 authored by 陈雪's avatar 陈雪

修改冲突

parent 9f5a8672
...@@ -41,6 +41,7 @@ class web2_request(BaseRequest): ...@@ -41,6 +41,7 @@ class web2_request(BaseRequest):
return self.api_send(self.SERVICE_URL["service_delete"]) return self.api_send(self.SERVICE_URL["service_delete"])
if __name__ == '__main__': if __name__ == '__main__':
print(web2_request().service_list("1", "10", "-1", "-1")) print(web2_request().service_list("1", "10", "-1", "-1"))
print(web2_request().service_review_list("1", "10", "0")) print(web2_request().service_review_list("1", "10", "0"))
......
...@@ -62,3 +62,6 @@ service_delete: ...@@ -62,3 +62,6 @@ service_delete:
csrfmiddlewaretoken: ${csrfmiddlewaretoken} csrfmiddlewaretoken: ${csrfmiddlewaretoken}
json: {} json: {}
isLogin: 1 isLogin: 1
develop_host: develop_host:
# backend: http://backend.paas-develop.env backend: http://backend.paas-develop.env
doctor: http://doctor.paas-develop.env # doctor: http://doctor.paas-develop.env
# backend: https://backend.igengmei.com # backend: https://backend.igengmei.com
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment