Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserLogs.java

@@ -38,6 +38,8 @@
    private String loginAgentBrowser;
    //登录设备操作系统
    private String loginAgentSystem;
    //登录设备的分辨率
    private String loginSystemScreen;
    //
    private Integer loginNums;
    //登录类型，账户密码、Token、微信、qq