Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

pansen

2019-01-25 30d0bd43f53740554e8387fcd14bfab689eeca9c

 QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.h

@@ -20,6 +20,9 @@
    // FaceDetectServer interface
public:
    virtual FaceDetect::ThftResult faceProperty(Ice::Int, Ice::Int, const FaceDetect::FacePos &, const std::string &, const Ice::Current &) override;

private:
    int m_ampleSize;
};