From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称

---
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index df0c1ae..963c790 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -10,6 +10,7 @@
 public class SampleProductDto2 extends OrderBy implements Serializable {
 
     private Integer id;
+    private Integer insProductId;
 
     @ValueTableShow(name = "鏍峰搧缂栧彿")
     private String sampleCode;
@@ -41,14 +42,20 @@
     private String inspectionValueType;
 
     @ValueTableShow(value = 12, name = "璇曢獙瑕佹眰")
-    private String ask;
+    private String tell;
 
-    @ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
+//    @ValueTableShow(value = 13, name = "妫�楠岀粨鏋�")
     private String lastValue;
 
     @ValueTableShow(value = 14, name = "缁撴灉鍒ゅ畾")
     private Integer insResult;
 
+    @ValueTableShow(value = 15, name = "妫�楠屼汉")
+    private String checkName;
+
+    @ValueTableShow(value = 16, name = "妫�楠屾棩鏈�")
+    private String checkTime;
+
     private String equipValue;
 
 }

--
Gitblit v1.9.3