Merge remote-tracking branch 'origin/master'

wu

2024-08-13 c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java

@@ -1,5 +1,6 @@
package com.mes.shelfrack.controller;



import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;

import com.mes.utils.Result;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.http.ResponseEntity;

@@ -105,7 +106,7 @@
    @ApiResponses({@ApiResponse(code = 200, message = "查询成功")})

    @GetMapping("/findshelfrack")

    public Result findshelfrack() {

        List<Map<String, Object>> result = shelfRackService.selectshelf_rack();

        List<RawUsageAndShelfRack> result = shelfRackService.selectshelf_rack();

        return Result.success(result);

    }