From af73f49872f899a1cb301ae6e3ee23ebc28daf20 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 17:15:07 +0800
Subject: [PATCH] 2025-06-23 设备台账接口对接完成
---
src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
similarity index 65%
rename from src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java
rename to src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
index 6613c27..576bef0 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.device.dto;
+package com.ruoyi.device.execl;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,63 +15,62 @@
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О")
+ @Excel(name = "璁惧鍚嶇О" ,sort = 1)
private String deviceName;
/**
* 瑙勬牸鍨嬪彿
*/
- @Excel(name = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿" ,sort = 2)
private String deviceModel;
/**
* 渚涘簲鍟嗗悕绉�
*/
- @Excel(name = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�",sort = 3)
private String supplierName;
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+ @Excel(name = "鍗曚綅",sort = 4)
private String unit;
/**
* 鏁伴噺
*/
- @Excel(name = "鏁伴噺")
+ @Excel(name = "鏁伴噺",sort = 5)
private BigDecimal number;
/**
* 鍚◣鍗曚环
*/
- @Excel(name = "鍚◣鍗曚环")
+ @Excel(name = "鍚◣鍗曚环",sort = 6)
private BigDecimal taxIncludingPriceUnit;
/**
* 鍚◣鎬讳环
*/
- @Excel(name = "鍚◣鎬讳环")
+ @Excel(name = "鍚◣鎬讳环",sort = 7)
private BigDecimal taxIncludingPriceTotal;
/**
* 绋庣巼
*/
- @Excel(name = "绋庣巼")
+ @Excel(name = "绋庣巼",sort = 8)
private BigDecimal taxRate;
/**
* 涓嶅惈绋庢�讳环
*/
- @Excel(name = "涓嶅惈绋庢�讳环")
+ @Excel(name = "涓嶅惈绋庢�讳环",sort = 9)
private BigDecimal unTaxIncludingPriceTotal;
/**
* 褰曞叆鏃堕棿
*
*/
- @Excel(name = "褰曞叆鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @Excel(name = "褰曞叆鏃堕棿",sort = 10)
private LocalDateTime createTime;
@@ -79,15 +78,10 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
- @TableField(fill = FieldFill.INSERT)
+ @Excel(name = "褰曞叆浜�",sort = 9)
private String createUser;
- /**
- * 绉熸埛ID
- */
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
+
}
--
Gitblit v1.9.3