Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "个性签名")
    private String info;

    @ApiModelProperty(value = "类型")
    private Integer type;

    @ApiModelProperty(value = "在职状态 正常>=1,离职<=0")
    private Integer jobState;