Merge remote-tracking branch 'origin/master'

xuhy

2024-12-27 525c120c93c2c25d8dfc59d4fac234b80b37d1c0

 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();