Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java

@@ -32,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @Controller
 @RequestMapping("/system/base_picture_location")
-@ResponseBody
 public class BasePictureLocationController extends BaseController
 {
     private String prefix = "system/base_picture_location";
@@ -52,7 +51,7 @@ public class BasePictureLocationController extends BaseController
      */
     @RequiresPermissions("system:base_picture_location:list")
     @PostMapping("/list")
-
+    @ResponseBody
     public TableDataInfo list(BasePictureLocation basePictureLocation)
     {
         startPage();