Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 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;