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

pans

2019-01-31 efafab5273ba3ff13a19f07088c320a5180188b6

 QiaoJiaSystem/StructureApp/AppPipeController.h

@@ -117,6 +117,7 @@
    std::string getFullFileName();

    std::mutex mutex;
    bool m_bSetWH;
};

#endif // APPPIPECONTROLLER_H