|
|
@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
|
|
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
|
|
|
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
|
|
|
-import io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.Data;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
@@ -83,7 +82,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 增资标准
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "增资标准")
|
|
|
+ @ExcelProperty(value = "增资标准")
|
|
|
private BigDecimal capitalIncreaseName;
|
|
|
/**
|
|
|
* 增资
|
|
|
@@ -108,7 +107,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 职级等级
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "职级等级")
|
|
|
+ @ExcelProperty(value = "职级等级")
|
|
|
private String rankSalaryName;
|
|
|
/**
|
|
|
* 职级工资
|
|
|
@@ -338,7 +337,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 领导干部考核补贴标准
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "领导干部考核补贴标准")
|
|
|
+ @ExcelProperty(value = "领导干部考核补贴标准")
|
|
|
private BigDecimal assessLeadingCadreSubsidyName;
|
|
|
/**
|
|
|
* 自定义5
|
|
|
@@ -368,7 +367,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 教研组长补贴标准
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "教研组长补贴标准")
|
|
|
+ @ExcelProperty(value = "教研组长补贴标准")
|
|
|
private BigDecimal teachingResearchName;
|
|
|
/**
|
|
|
* 教研组长补贴
|
|
|
@@ -378,7 +377,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 教研组长考核补贴标准
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "教研组长考核补贴标准")
|
|
|
+ @ExcelProperty(value = "教研组长考核补贴标准")
|
|
|
private BigDecimal assessTeachingResearchName;
|
|
|
/**
|
|
|
* 教研组长考核补贴
|
|
|
@@ -423,7 +422,7 @@ public class WageExcel implements Serializable {
|
|
|
/**
|
|
|
* 班主任考核津贴标准
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "班主任考核津贴标准")
|
|
|
+ @ExcelProperty(value = "班主任考核津贴标准")
|
|
|
private BigDecimal teacherAssessSubsidy;
|
|
|
/**
|
|
|
* 班主任考核津贴
|