From 3ac8d43ba46808cfe2fb51111da2456fd02477e1 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期二, 08 七月 2025 11:57:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java index cfa078b..37ab99e 100644 --- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java +++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java @@ -30,20 +30,20 @@ /** * 鍑哄叆搴撴暟閲� */ - @Excel(name = "鍑哄叆搴撴暟閲�") + @Excel(name = "鍏ュ簱鏁伴噺") private BigDecimal inboundNum; /** * 鍑哄叆搴撴椂闂� */ - @Excel(name = "鍑哄叆搴撴椂闂�") + @Excel(name = "鍏ュ簱鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime createDate; /** * 鍑哄叆搴撶敤鎴� */ - @Excel(name = "鍑哄叆搴撶敤鎴�") + @Excel(name = "鍏ュ簱浜�") private String createBy; /** @@ -74,7 +74,7 @@ /** * 绋庣巼 */ - @Excel(name = "绋庣巼") + @Excel(name = "绋庣巼(%)") private BigDecimal taxRate; /** -- Gitblit v1.9.3