.3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/DataManagerServer/http_configserver.h

@@ -121,7 +121,7 @@
    std::string createDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);

    /**
     *
     * 删除数据地库
     * @param ip
     * @param port
     * @param content