Merge remote-tracking branch 'origin/master'

tangzy

2021-09-17 d9caa6f336a052a852b4b9f9fedb57bdbed77386

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

@@ -238,4 +238,15 @@
   @TableField("reason_for_leav")
   private String reasonForLeav;

   private String holdv;

   @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private Date holdvtime;

   /**
    * 是否缴纳保险 0：是   1：否
    */
   private Integer insurance;

}