Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 9cb78a5414cdbfdd59931b14759bf9800d275448

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

@@ -29,7 +29,9 @@

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "项目组id")
    @TableField("team_id")
    private String teamId;
    @ApiModelProperty(value = "调度id")
    @TableField("dispatch_id")
    private String dispatchId;