Merge remote-tracking branch 'origin/master'
# Conflicts:
# febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
| | |
|---|
| | | @ExcelField(value = "请假（天）") |
|---|
| | | private BigDecimal leaveDay = BigDecimal.ZERO; |
|---|
| | | |
|---|
| | | @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项") |
|---|
| | | @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项") |
|---|
| | | @TableField("deduct") |
|---|
| | | @ExcelField(value = "有无代扣款项") |
|---|
| | | private BigDecimal deduct = BigDecimal.ZERO; |
|---|
| | | private String deduct = ""; |
|---|
| | | |
|---|
| | | @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）") |
|---|
| | | @TableField("absenteeism") |
|---|
