From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"

---
 QiaoJiaSystem/CMakeLists.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 400e343..24bb196 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -22,6 +22,7 @@
 add_subdirectory(RapidStructureApp)
 add_subdirectory(RecordVideo)
 add_subdirectory(DataManagerServer)
+add_subdirectory(EncodeServer)
 
 
 #add_subdirectory(FaceSearchDbWithImg)

--
Gitblit v1.8.0