Merge remote-tracking branch 'origin/master'

yudao-module-supplier/yudao-module-supplier-api/src/main/java/cn/iocoder/yudao/module/supplier/enums/common/SupplierStatusEnum.java

@@ -15,9 +15,9 @@ import java.util.Arrays;
 @Getter
 public enum SupplierStatusEnum implements ArrayValuable<Integer> {
 
-    DRAFT(0, "草稿"),
-    ACTIVE(10, "活动"),
-    CLOSE(20, "关闭");
+    DRAFT(1, "草稿"),
+    ACTIVE(2, "活动"),
+    CLOSE(3, "关闭");
 
     private final Integer status;
     private final String name;

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/ProductController.java

@@ -93,7 +93,7 @@ public class ProductController {
 
     @GetMapping("all")
     @Operation(summary = "获取所有供应商信息")
-    @PreAuthorize("@ss.hasPermission('supplier:base:all')")
+    @PreAuthorize("@ss.hasPermission('supplier:product:query')")
     public CommonResult<List<ProductRespVO>> getAll() {
         List<ProductDO> all = productService.getAll();
         List<ProductRespVO> bean = BeanUtils.toBean(all, ProductRespVO.class);

yudao-module-supplier/yudao-module-supplier-biz/src/main/java/cn/iocoder/yudao/module/supplier/controller/admin/product/SupplierController.java

@@ -102,7 +102,7 @@ public class SupplierController {
 
     @GetMapping("all")
     @Operation(summary = "获取所有供应商信息")
-    @PreAuthorize("@ss.hasPermission('supplier:base:all')")
+    @PreAuthorize("@ss.hasPermission('supplier:base:query')")
     public CommonResult<List<SupplierRespVO>> getAll() {
         List<SupplierDO> all = supplierService.getAll();
         List<SupplierRespVO> bean = BeanUtils.toBean(all, SupplierRespVO.class);