Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-17 ee22e4cdf5656272443365aa54bf08863f7fae52

 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;

}