From 525c120c93c2c25d8dfc59d4fac234b80b37d1c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 09:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java b/manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java
index 6fe24eb..ae9f38a 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TInventoryController.java
@@ -19,6 +19,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -156,6 +157,7 @@
         TInventoryInfoVO tInventoryInfoVO = new TInventoryInfoVO();
 
         TInventory byId = inventoryService.getById(id);
+        BeanUtils.copyProperties(byId, tInventoryInfoVO);
         switch (byId.getType()){
             case 1:
                 List<TInventoryFrameDetail> list = inventoryFrameDetailService.lambdaQuery().eq(TInventoryFrameDetail::getInventoryId, id).list();

--
Gitblit v1.7.1