Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -154,7 +154,7 @@
    HCCore
    hcnetsdk
    pthread
    mysqlpp
#    mysqlpp
    )

#add_executable(Apptest