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

puzhibing

2024-03-11 aa8afb8f18fee21361742b62061b4d4db4a09bb5

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/transfer/UserDto.java

@@ -29,7 +29,15 @@
   private Date createtime;
   private Integer version;
   private String avatar;
   private String idCard;

   public String getIdCard() {
      return idCard;
   }

   public void setIdCard(String idCard) {
      this.idCard = idCard;
   }

   public Integer getId() {
      return id;