From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 6fefc5d..902d0a2 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -24,7 +24,7 @@
@ApiModel
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -127,9 +127,17 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒 9-鍘熸枡瀹℃壒
*/
private Integer approveType;
+
+ /**
+ * 瀹℃壒鍏宠仈璁板綍id
+ */
+ private Long approveRecordId;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
@@ -157,8 +165,15 @@
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
-
+ /**
+ * 璁惧鎶ヤ慨id
+ */
+ private Long deviceRepairId;
+ /**
+ * 鎶ヤ慨閲戦
+ */
+ private BigDecimal maintenancePrice;
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3