From 832e4ac4947685f29d4d7a0a45d3025d8b062500 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 7 Feb 2025 18:12:42 +0800
Subject: [PATCH] =?UTF-8?q?2/7=20=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=811.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java  | 7 +++++++
 .../api/service/thrsys/impl/ThrProductsServiceImpl.java    | 4 ++++
 .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml     | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 565dfc36c..aa74b4365 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -98,6 +98,12 @@ public class UdiRelevanceResponse {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+    private String basicPrductRemak9;
+    private String basicPrductRemak10;
+    private String basicPrductRemak11;
+    private String basicPrductRemak12;
+    private String basicPrductRemak13;
+
     private BigDecimal price;
     private String PRId;
 
@@ -166,6 +172,7 @@ public class UdiRelevanceResponse {
     private Long relIdFk;
 
 
+
     /**
      * 一级分类名称(学科，品名）
      */
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
index 0a3f2e00e..e2b91372e 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
@@ -42,6 +42,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 2a0345479..01d0a417b 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -325,6 +325,11 @@
                basic_products.basicPrductRemak6,
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
+               basic_products.basicPrductRemak9,
+               basic_products.basicPrductRemak10,
+               basic_products.basicPrductRemak11,
+               basic_products.basicPrductRemak12,
+               basic_products.basicPrductRemak13,
                basic_products.sfwblztlcp,
                basic_products.cgzmraqxgxx,
                basic_products.sfbjwycxsy,