属性组

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/RuleInfoEditReq.java

@@ -23,6 +23,10 @@ public class RuleInfoEditReq extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    /** 规格名称 */
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Integer id;
+
     /** 规格名称 */
     @ApiModelProperty(name = "规格名称", value = "规格名称")
     private String name;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java

@@ -54,6 +54,18 @@ public class AttributeGroupController extends BaseController {
         return Result.success(tableDataInfo);
     }
 
+<<<<<<< HEAD
+=======
+    @ApiOperation("获取属性组列表")
+    @RequiresPermissions("product:attributeGroup:list")
+    @GetMapping("listAll")
+    public Result<TableDataInfo<AttributeGroupPageResp>> listAttributeGroupPageResp(AttributeGroupQueryReq attributeGroupQueryReq){
+        startPage();;
+        TableDataInfo<AttributeGroupPageResp> page = attributeGroupService.page(AttributeGroup.queryBuild(attributeGroupQueryReq));
+        return Result.success(page);
+    }
+
+>>>>>>> 3028276 (属性组)
     /**
      * 导出属性组列表
      */