Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-06 6f27f088e5d9e828bdce65ab85984d2084bab222

 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;
};