From c4ffd9c0fc69aeb27681b4c2cb460d0818981a40 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sun, 30 Nov 2025 18:45:50 +0800
Subject: [PATCH] update

---
 .../modules/database/entity/ExperimentSampleInfo.java | 11 ++++++-----
 .../service/impl/ExperimentSampleInfoServiceImpl.java |  5 ++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentSampleInfo.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentSampleInfo.java
index 0d30c39..a6d1b0a 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentSampleInfo.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentSampleInfo.java
@@ -92,13 +92,14 @@ public class ExperimentSampleInfo implements Serializable {
     /**
      * 生产厂家
      */
-    @Schema(description = "生产厂家ID")
-    private String sampleManufacturer;
+    @Schema(description = "生产厂家")
     @Excel(name = "生产厂家", width = 15)
+    private String sampleManufacturer;
+//
 
-    @Schema(description = "生产厂家名称")
-    @TableField(exist = false)
-    private String sampleManufacturerName;
+//    @Schema(description = "生产厂家名称")
+//    @TableField(exist = false)
+//    private String sampleManufacturerName;
     /**
      * 图片
      */
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java
index fa61255..7f790a2 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentSampleInfoServiceImpl.java
@@ -25,7 +25,7 @@ import java.util.Optional;
 public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampleInfoMapper, ExperimentSampleInfo>
         implements IExperimentSampleInfoService {
     @Autowired
-    private IClientService                       clientService;
+    private IClientService clientService;
 
     @Override
     public ExperimentSampleInfo getById(Serializable id) {
@@ -35,7 +35,6 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampl
     }
 
 
-
     private void assembleDetails(ExperimentSampleInfo sampleInfo) {
         if (ObjUtil.isNull(sampleInfo)) {
             return;
@@ -43,7 +42,7 @@ public class ExperimentSampleInfoServiceImpl extends ServiceImpl<ExperimentSampl
         String sampleManufacturerId = sampleInfo.getSampleManufacturer();
         if (StringUtils.isNotBlank(sampleManufacturerId)) {
             Client byId = clientService.getById(sampleManufacturerId);
-            sampleInfo.setSampleManufacturerName(Optional.ofNullable(byId).map(v -> v.getName()).orElse(sampleManufacturerId));
+            sampleInfo.setSampleManufacturer(Optional.ofNullable(byId).map(v -> v.getName()).orElse(sampleManufacturerId));
         }
     }