From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步（安全培训-筛选优化）
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 64177e8..44d89b8 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,12 +1,9 @@
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;
-
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
@@ -14,6 +11,11 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒娴佺▼琛�
@@ -24,7 +26,7 @@
@ApiModel
public class ApproveProcess{
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -127,9 +129,12 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒 9-鍏ュ簱瀹℃壒
*/
private Integer approveType;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
@@ -167,5 +172,20 @@
private BigDecimal maintenancePrice;
private static final long serialVersionUID = 1L;
+ /**
+ * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+ */
+ @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+ private boolean inventoryReview;
-}
\ No newline at end of file
+ /**
+ * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+ */
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ private String storageType;
+
+ /**
+ * 鍏ュ簱id
+ */
+ private Long recordId;
+}
--
Gitblit v1.9.3