代码合并

Administrator

2021-07-12 6915414d07fdec8b92a0fc5cf30b48d501a4ddac

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

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