Merge branch 'test' into ext-dev

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -160,6 +160,9 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value ="用户ID集合信息")
     private List<String> userInfoIdList;
 
+    @ApiParam(value ="登录次数")
+    private Integer userLoginNum;
+
     public SysUser getSysUser(){
         SysUser user = new SysUser();
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
@@ -172,6 +175,7 @@ public class UserDetailModel extends BaseBean {
         user.setUserLoginPassword(this.userLoginPassword);
         user.setLanguageCode(this.userLanguageCode);
         user.setOrganizeCode(this.organizeCode);
+        user.setUserLoginNum(this.userLoginNum);
 
         return user;
     }
@@ -206,6 +210,7 @@ public class UserDetailModel extends BaseBean {
         info.setUserGrade(this.infoGrade);
         info.setUserEmployeeType(this.infoEmployeeType);
         info.setOrganizeCode(this.organizeCode);
+        info.setUserLoginNum(this.userLoginNum);
 
         return info;
     }