Commit 38afdfe7 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

parents ccc27073 92815954
...@@ -179,7 +179,7 @@ public class TPreEmpMain extends BaseEntity { ...@@ -179,7 +179,7 @@ public class TPreEmpMain extends BaseEntity {
@ExcelAttribute(name = "业务类型汇总") @ExcelAttribute(name = "业务类型汇总")
@ExcelProperty("业务类型汇总") @ExcelProperty("业务类型汇总")
@Schema(description = "业务类型汇总") @Schema(description = "业务类型汇总")
@TableField @TableField(exist = false)
private String businessType; private String businessType;
/** /**
* 员工类型(字典值,0外包1派遣2代理) * 员工类型(字典值,0外包1派遣2代理)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment