From 0fcc6eb314fafab572def73100584d353089ee8c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 16:29:30 +0800
Subject: [PATCH] Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao
---
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 15 +++++++++++++++
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 15 +++++++++++++++
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 3 +++
3 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 26bdc91..7746fc6 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -72,6 +72,21 @@
private BigDecimal unTaxIncludingPriceTotal;
/**
+ * 鍚敤鎶樻棫
+ */
+ private Boolean enableDepreciation;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ private String storageLocation;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ private String deviceBrand;
+
+ /**
* 褰曞叆鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index caa8f32..04d0d62 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -76,6 +76,21 @@
private BigDecimal unTaxIncludingPriceTotal;
/**
+ * 鍚敤鎶樻棫
+ */
+ private Boolean enableDepreciation;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ private String storageLocation;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ private String deviceBrand;
+
+ /**
* 褰曞叆鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 9cee459..e1c96ab 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -26,6 +26,9 @@
dl.update_time ,
su.user_name AS createUser,
dl.update_user,
+ dl.device_brand,
+ dl.enable_depreciation,
+ dl.storage_location,
dl.tenant_id
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
--
Gitblit v1.9.3