Merge remote-tracking branch 'origin/master'

jiangping

2024-01-18 553831c82c2e8f8ff7b230c4d536cf99c47ece5b

 server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.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;
@@ -88,4 +89,7 @@
    @ExcelColumn(name="状态0正常 1停用")
    private Integer status2;

    @ApiModelProperty(value = "工种名称")
    @TableField(exist = false)
    private String workTypeName;
}