Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-21 09c297c75f036f017dedfb163e338c6c427477d5

 basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java

@@ -44,6 +44,7 @@
    private Integer createUser;

    @ApiModelProperty(value = "创建人")
    @TableField(select = false,exist = false)
    private String createUserName;

    @ApiModelProperty(value = "修改人id")