From f8e79ecd973b35e98bc189328c7efa3f88f10f02 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 28 三月 2026 10:11:55 +0800
Subject: [PATCH] Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-management-after into hxsj
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index c1114bd..7e04634 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,6 +1,7 @@
package com.ruoyi.approve.pojo;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -22,7 +23,7 @@
@ApiModel
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -124,9 +125,14 @@
// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
- /**
- * 瀹℃壒绫诲瀷
- */
+ /** * 瀹℃壒绫诲瀷
+ * 0: "鍗忓悓瀹℃壒绠＄悊琛�",
+ * 1: "鍏嚭绠＄悊瀹℃壒琛�",
+ * 2: "璇峰亣绠＄悊瀹℃壒琛�",
+ * 3: "鍑哄樊绠＄悊瀹℃壒琛�",
+ * 4: "鎶ラ攢绠＄悊瀹℃壒琛�",
+ * 5: "閲囪喘鐢宠瀹℃壒琛�",
+ * 6: "閿�鍞鍗曞鎵硅〃", */
private Integer approveType;
/**
@@ -139,8 +145,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