From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
index 3ae4ed7..2d5cff5 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreQualificationController.java
@@ -5,7 +5,7 @@
 import com.oying.modules.pc.store.domain.StoreQualification;
 import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
 import com.oying.modules.pc.store.service.StoreQualificationService;
-import com.oying.utils.PageResult;
+import com.oying.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,9 +33,9 @@
     @GetMapping
     @ApiOperation("查询店铺资质")
     @PreAuthorize("@el.check('storeQualification:list')")
-    public ResponseEntity<PageResult<StoreQualification>> queryStoreQualification(StoreQualificationQueryCriteria criteria) {
+    public ResponseEntity<Object> queryStoreQualification(StoreQualificationQueryCriteria criteria) {
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
-        return new ResponseEntity<>(storeQualificationService.queryAll(criteria, page), HttpStatus.OK);
+        return new ResponseEntity<>(R.success(storeQualificationService.queryAll(criteria, page)), HttpStatus.OK);
     }
 
     @PostMapping
@@ -44,7 +44,7 @@
     @PreAuthorize("@el.check('storeQualification:add')")
     public ResponseEntity<Object> createStoreQualification(@Validated @RequestBody StoreQualification resources) {
         storeQualificationService.create(resources);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(R.success(),HttpStatus.CREATED);
     }
 
     @PutMapping
@@ -53,7 +53,7 @@
     @PreAuthorize("@el.check('storeQualification:edit')")
     public ResponseEntity<Object> updateStoreQualification(@Validated @RequestBody StoreQualification resources) {
         storeQualificationService.update(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(R.success(),HttpStatus.NO_CONTENT);
     }
 
     @DeleteMapping
@@ -62,6 +62,6 @@
     @PreAuthorize("@el.check('storeQualification:del')")
     public ResponseEntity<Object> deleteStoreQualification(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
         storeQualificationService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(R.success(),HttpStatus.OK);
     }
 }

--
Gitblit v1.9.3