yz
2021-02-22 1466ee58f3893b631a0d6711ede0320f252b2657
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -271,6 +271,19 @@
    @TableField("remark")
    private String remark = "";
    
    @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
    @TableField("expenseReport")
    @ExcelField(value = "报单号")
    private String expenseReport = "";
    @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
    @TableField("settleDate")
    @JsonSerialize(using = DateSerializer.class)
    @JsonDeserialize(using = DateDeSerializer.class)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
    private Date settleDate;
    @TableField(exist = false)
   private String hrDoDateStr= "";