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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java

@@ -94,7 +94,16 @@
    */
   @TableField("objectId")
   private Integer objectId;
   @TableField("idCard")
   private String idCard;

   public String getIdCard() {
      return idCard;
   }

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

   public Integer getId() {
      return id;