Merge remote-tracking branch 'origin/master'

zss

2024-08-12 2c00320ecf5745742b9dc9a960f506165e880727

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

@@ -105,4 +105,7 @@
    @ApiModelProperty(value = "LIMS关联的部门id")
    private String departLimsId;

    @ApiModelProperty(value = "人事系统关联的id")
    private String companyId;

}