Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 QiaoJiaSystem/LocalDBTool/SqliteFaceEncap.cpp

@@ -346,7 +346,6 @@
                memcpy(t_feas.faceFeature.data(), t_fea.data(), t_fea.size());
//            string create_time = query.value(2).toString().toStdString();
                t_feas.faceurl = query.value(3).toString().toStdString();
                t_feas.enable = query.value(5).toString().toStdString();
            }
        }
    }