Merge remote-tracking branch 'origin/master'

Administrator

2021-07-14 905fb10c692d1ba25c0c032141e550ebc18040d9

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -148,6 +148,7 @@
   @ApiModelProperty(value = "入职时间")
   private String rtime;
   private String hold;
   private String jurisdiction;


}