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

yaowanxin

6 天以前 dfacb4e315a49f2c0399574ef094c87b96e7e248

 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")