Merge remote-tracking branch 'origin/master'

doum

昨天 04aa86aaad90ac02a4d167129ab3e530e9a9589c

 server/dmmall_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -40,8 +40,8 @@
        loginLog.setLoginUsername(dto.getUsername());
        loginLog.setLoginTime(new Date());
        loginLog.setSystemVersion(systemVersion);
        loginLog.setIp(Utils.User_Client.getIP(request));
        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
//        loginLog.setIp(Utils.User_Client.getIP(request));
//        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
        loginLog.setPlatform(Utils.User_Client.getPlatform(request));
        loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
        loginLog.setOsInfo(Utils.User_Client.getOS(request));