Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

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

@@ -16,6 +16,7 @@
 */
package org.springblade.system.user.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -93,5 +94,11 @@
   private String postId;
   private String online_status;

   @TableField("work_status")
   private String work_status;

   @TableField("online_status")
   private String online_status;


}