Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

1 天以前 1724f77c35022b643c28dd3e5547679a5edc2d49

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java

@@ -17,7 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库存信息")
@@ -36,6 +36,14 @@
    }

    @PreAuthorize("hasAuthority('manager:stock:list')")
    @PostMapping("/inStock/num/page")
    public R inStockpage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Stock, BaseParam> pageParam = new PageParam<>(baseParam, Stock.class);
        return R.ok().add(stockService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @PreAuthorize("hasAuthority('manager:stock:list')")
    @PostMapping("/stock/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(stockService.list());