Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

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