Merge remote-tracking branch 'origin/master'

mitao

3 天以前 dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6

 ruoyi-system/src/main/java/com/ruoyi/system/model/AssetInventoryTaskItem.java

@@ -50,9 +50,13 @@
    @TableField("real_dept_id")
    private Integer realDeptId;

    @ApiModelProperty(value = "实存部门名称")
    @TableField("real_dept_name")
    private String realDeptName;

    @ApiModelProperty(value = "实存使用人")
    @TableField("real_user_id")
    private Integer realUserId;
    @TableField("real_user_name")
    private String realUserName;

    @ApiModelProperty(value = "异常说明")
    @TableField("exception_explain")