Merge remote-tracking branch 'origin/master'

zengh

2021-07-16 43d4a8434592145ae3fcfb30f332a20f057a1055

 src/main/java/org/springblade/modules/recordk/entity/Recordk.java

@@ -146,6 +146,6 @@
   private Date officetime;
   @TableId(value = "id", type = IdType.AUTO)
   private Integer id;

   private String deptid;

}