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

zhou zhou

昨天 1724f77c35022b643c28dd3e5547679a5edc2d49

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

@@ -22,7 +22,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 = "仓库")
@@ -116,6 +116,7 @@
            }
        }

        warehouse.setUpdateTime(new Date());
        if (!warehouseService.updateById(warehouse)) {
            return R.error("Update Fail");
        }