Merge remote-tracking branch 'origin/master'

zengh

2021-05-19 977444532d644d48b5b55ca89a1e3d62b5dd8782

 blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -87,6 +87,7 @@
   /**
    * 部门id
    */
   @TableField("dept_id")
   private String deptId;
   /**
    * 岗位id