Merge remote-tracking branch 'origin/master'

Administrator

2022-05-18 644ed3e30bbee9a417dfbe649f2a72df25a7efb1

 src/main/java/org/springblade/modules/member/entity/Member.java

@@ -76,4 +76,21 @@
   @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date rtime;

   /**
    * 公司id
    */
   @ApiModelProperty(value = "公司id")
   @TableField("dept_id")
   private String deptId;

   /**
    * 学历
    */
   private Integer education;

   /**
    * 证书 url
    */
   private String paper;
}