1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/yw...

pans

2019-01-31 efafab5273ba3ff13a19f07088c320a5180188b6

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