From 7964b91188f473956b322e758fdabbfb169898da Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Tue, 16 Sep 2025 20:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9E=8B=E4=B8=AD=E7=9A=84=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C?=
=?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bonus/material/device/domain/DevInfo.java | 3 +++
.../mapper/material/device/DevInfoMapper.xml | 16 +++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
index 4589f86..c933295 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
@@ -72,6 +72,9 @@ public class DevInfo extends BaseEntity {
@ApiModelProperty(value = "设备数量")
private Integer deviceCount;
+ @ApiModelProperty(value = "设备单位，例如（台）")
+ private String deviceUnitType;
+
@ApiModelProperty(value = "比率的范围,比如: x%-y%")
private String ratioRange;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index f8a7330..7a327ed 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name as deviceName,
d.device_weight as deviceWeight,
d.device_count as deviceCount,
+ d.device_unit_type as deviceUnitType,
d.type_id as typeId,
mt4.type_name as typeName,
mt4.unit_name as unitName,
@@ -235,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name as deviceName,
d.device_weight as deviceWeight,
d.device_count as deviceCount,
+ d.device_unit_type as deviceUnitType,
d.type_id as typeId,
d.check_date as checkDate,
d.check_cycle as checkCycle,
@@ -304,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
device_name,
device_weight,
device_count,
+ device_unit_type,
code,
identify_code,
type_id,
@@ -326,18 +329,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
own_co,
person,
person_phone,
- level_type
+ level_type,
assetValue,
purchaseSource,
create_time,
creator,
update_time,
- update_by,
+ updateBy,
specification,
deposit,
is_operator,
is_active,
- update_by,
own_id,
check_date,
check_cycle,
@@ -352,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{deviceName},
#{deviceWeight},
#{deviceCount},
+ #{deviceUnitType},
#{code},
#{identifyCode},
#{typeId},
@@ -370,22 +373,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{jsMonthPrice},
#{jsDayPrice},
#{description},
- #{gpsCode},
+ #{gpsCode},
#{companyId},
#{person},
#{personPhone},
- #{levelType}
+ #{levelType},
#{assetValue},
#{purchaseSource},
now(),
#{creator},
now(),
- #{update_by},
+ #{updateBy},
#{specification},
#{deposit},
#{isOperator},
#{isActive},
- #{updateBy},
#{ownId},
#{checkDate},
#{checkCycle},