From f857725590069ef7c863d0a7ec26ecafb356ccd2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 04 十二月 2025 16:50:40 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 4 ++++
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 4 ++++
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 2 ++
src/main/resources/application.yml | 2 +-
4 files changed, 11 insertions(+), 1 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..916a9e0 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -41,6 +41,10 @@
*/
private String supplierName;
+ private String deviceBrand;
+
+ private String storageLocation;
+
/**
* 鍗曚綅
*/
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index caa8f32..6101426 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -75,6 +75,10 @@
*/
private BigDecimal unTaxIncludingPriceTotal;
+ private String deviceBrand;
+
+ private String storageLocation;
+
/**
* 褰曞叆鏃堕棿
*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 33d6165..c79d967 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: demo
+ active: dev
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 9cee459..0b3a5f9 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -21,6 +21,8 @@
dl.tax_including_price_unit,
dl.tax_including_price_total,
dl.tax_rate,
+ dl.device_brand,
+ dl.storage_location,
dl.un_tax_including_price_total,
dl.create_time,
dl.update_time ,
--
Gitblit v1.9.3