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

sso-common/src/main/java/com/uas/sso/entity/UserView.java

@@ -78,12 +78,12 @@ public class UserView implements Serializable {
     /**
      * 密码强度
      */
-    private int passwordLevel;
+    private Integer passwordLevel;
 
     /**
      * 有密保
      */
-    private boolean hasQuestion;
+    private Boolean hasQuestion;
 
     /**
      * 用户身份认证状态
@@ -211,19 +211,19 @@ public class UserView implements Serializable {
         this.identityValidCode = identityValidCode;
     }
 
-    public int getPasswordLevel() {
+    public Integer getPasswordLevel() {
         return passwordLevel;
     }
 
-    public void setPasswordLevel(int passwordLevel) {
+    public void setPasswordLevel(Integer passwordLevel) {
         this.passwordLevel = passwordLevel;
     }
 
-    public boolean isHasQuestion() {
+    public Boolean getHasQuestion() {
         return hasQuestion;
     }
 
-    public void setHasQuestion(boolean hasQuestion) {
+    public void setHasQuestion(Boolean hasQuestion) {
         this.hasQuestion = hasQuestion;
     }