1.优化正式库 2.yml设置

liding

11 小时以前 c8fbeff3b07f96ffb4624dd64344ac00ec0c8ef8

 main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java

@@ -8,6 +8,7 @@
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -23,6 +24,7 @@

@RestController
@AllArgsConstructor
@Slf4j
@RequestMapping("/officialInventory")
public class OfficialInventoryController {

@@ -32,7 +34,7 @@
     * 正式库库表查询
     */
    @GetMapping("/list")
    public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
    public R<IPage<OfficialInventoryDto>> list(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto) {
        IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
        return R.ok(list);
    }
@@ -61,6 +63,7 @@
        return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
    }


    /**
     * 合并
     */