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

pansen

2019-03-08 5fa7c97d9544e7afdf781a93e8ffb58dce22c977

 QiaoJiaSystem/DataManagerServer/vss/dao/BaseDao.h

@@ -77,7 +77,8 @@
        return rowDataList;
    }

    static Json::Value findJsonArray(string sql) {
    static Json::Value findJsonArray(string sql, std::map<std::string, std::string>& whereColumns) {
        sql = sql + getWhereColumnNameValuePair(whereColumns);
        initConnection();
        mysqlpp::Query query = conn->query(sql);
        Json::Value rowList;