Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

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

@@ -94,11 +94,8 @@
   private String postId;
   private String online_status;

   @TableField("work_status")
   private String work_status;

   @TableField("online_status")
   private String online_status;


}