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/ProcessSample.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
index 404125e..1865cbb 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessSample.java
@@ -59,8 +59,8 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍏宠仈鎬昏〃鍘嗗彶id")
- private Integer totalSampleId;
+ @ApiModelProperty("濮旀墭鍗昳d")
+ private Integer inspectionOrderId;
@ApiModelProperty("鏀舵牱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3