123

all_backend_api/gmai_request.py

@@ -21,8 +21,7 @@ class gmai_request(BaseRequest):
 
         return self.api_send(self.data["eyelids_plastic"])
 
-<<<<<<< HEAD
-=======
+
     # 模拟发型，眉毛，美瞳效果
     def simulate_analyze(self,device_id,image_url,style_id,type_id):
         self.params["device_id"] = device_id
@@ -66,7 +65,9 @@ if __name__ == '__main__':
     # 测颜值和 上次结果
     # print(gmai_request().plastic_analysis_v3("869412032478155", "2021/06/01/1524/8a28dd0a3b8e",landmark,1))
     # print(gmai_request().plastic_analysis_v3("869412032478155", "", "", 1))
->>>>>>> 350a88c602aa982cfdafc10ea6d1f4946f15da96
+
+
+
 
 
 # if __name__ == '__main__':