Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-30 464043930df178727b357e2b31b4e5f19e1e17a8

 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;