From bbf8efb4cf186a753128a88822cfd28af46a0f38 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期二, 03 六月 2025 14:56:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java index 370394c..7839358 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java @@ -350,5 +350,16 @@ @ApiModelProperty("甯傚唴浜ら�氳垂") private BigDecimal cityfee; + + @ApiModelProperty("涓婃姤鏃堕棿/鎻愪氦瀹℃壒鐨勭敵璇锋椂闂�") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date applyTime; + + /** + * 缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害 + */ + @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害") + @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛e害銆�3骞村害") + private Integer performancetype; } -- Gitblit v1.9.3