Merge remote-tracking branch 'origin/master'

k94314517

2024-01-17 bc22a1fce8b936f61e1f799689ee5795fc2508b0

 server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -66,5 +67,8 @@
    @ApiModelProperty(value = "工种编码（关联worktype）", example = "1")
    @ExcelColumn(name="工种编码（关联worktype）")
    private Integer worktypeId;
    @ApiModelProperty(value = "工种名称", example = "1")
    @TableField(exist = false)
    private String worktypeName;

}