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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/vo/UserVO.java

@@ -41,11 +41,8 @@
   @JsonSerialize(using = ToStringSerializer.class)
   private Long id;

   /**
    * 密码
    */
   @JsonIgnore
   private String password;

   private String password2;

   /**
    * 租户名
@@ -81,4 +78,8 @@
    * 拓展信息
    */
   private String userExt;

   private String userId;

   private String distictName;
}