Merge branch 'dev' into pay_master

zhaoxiaohao

2020-09-29 0bad58cb6d46ec5c111d3adaee11337c5ccd5d9c

 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