From f206c80520a83a28b3caa91a3fbbd9d039dd8456 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 22 四月 2025 16:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

---
 cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
index e9a7411..078e04e 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessDeal.java
@@ -62,4 +62,11 @@
 
     @ApiModelProperty("鍏宠仈鐨勫巻鍙叉�昏〃id")
     private Integer totaldealId;
+
+    @ApiModelProperty("鍏宠仈鐨勬牱鍝佹帴鏀秈d")
+    private Integer processSampleId;
+
+    @ApiModelProperty("搴忓彿")
+    @TableField(select = false,exist = false)
+    private String indexs;
 }

--
Gitblit v1.9.3