Merge branch 'zhaowenbo_branch'

# Conflicts: # doc/“定时起飞”用例实现的顺序图.eddx # doc/森警系统体系结构图.eddx # src/fire/fire/curl.h
1 year ago · 82ea52c47e
parent 1fb0851921 2777952a28
commit 82ea52c47e
2 changed files with 3219 additions and 1 deletions
--- a/src/fire/fire/curl.h
+++ b/src/fire/fire/curl.h
--- a/src/fire/fire/fire.cpp
+++ b/src/fire/fire/fire.cpp
@ -1,6 +1,6 @@
 #include <iostream>
 #include <string>
-#include <../curl-8.1.2/include/curl/curl.h>
+#include <curl.h>
 //#include <json/json.h>
 static size_t WriteCallback(void* contents, size_t size, size_t nmemb, void* userp)