diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java
new file mode 100644
index 0000000..eacb1f8
--- /dev/null
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java
@@ -0,0 +1,50 @@
+package com.muyu.product.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import io.swagger.annotations.*;
+import com.muyu.common.core.annotation.Excel;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+
+/**
+ * 属性与组中间对象 as_attribute_group
+ *
+ * @author XiaoHuang
+ * @date 2024-03-07
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("as_attribute_group")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AsAttributeGroup", description = "属性与组中间")
+public class AsAttributeGroup extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id",type = IdType.AUTO)
+    @ApiModelProperty(name = "主键", value = "主键")
+    private Long id;
+
+    /** 组id
+ */
+    @Excel(name = "组id")
+    @ApiModelProperty(name = "组id", value = "组id ", required = true)
+    private Long groupId;
+
+    /** 属性id */
+    @Excel(name = "属性id")
+    @ApiModelProperty(name = "属性id", value = "属性id", required = true)
+    private Long attributeId;
+
+
+}
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java
index b7e7413..fde7d80 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsCategoryAttribute.java
@@ -49,24 +49,24 @@ public class AsCategoryAttribute extends BaseEntity {
     /** 创建人 */
     @Excel(name = "创建人")
     @ApiModelProperty(name = "创建人", value = "创建人", required = true)
-    private String createdBy;
+    private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(name = "创建时间", value = "创建时间", required = true)
-    private Date createdTime;
+    private Date createTime;
 
     /** 更新人 */
     @Excel(name = "更新人")
     @ApiModelProperty(name = "更新人", value = "更新人")
-    private String updatedBy;
+    private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(name = "更新时间", value = "更新时间")
-    private Date updatedTime;
+    private Date updateTime;
 
 
 }
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java
index d5318e8..8423fa2 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeInfo.java
@@ -44,10 +44,7 @@ public class AttributeInfo extends BaseEntity {
     @ApiModelProperty(name = "属性名", value = "属性名", required = true)
     private String name;
 
-    /** 分组 */
-    @Excel(name = "分组")
-    @ApiModelProperty(name = "分组", value = "分组")
-    private Long groupId;
+
 
     /** 创建人 */
     @ApiModelProperty(name = "创建人", value = "创建人")
@@ -74,7 +71,6 @@ public class AttributeInfo extends BaseEntity {
     public static AttributeInfo queryBuild( AttributeInfoQueryReq attributeInfoQueryReq){
         return AttributeInfo.builder()
                 .name(attributeInfoQueryReq.getName())
-                .groupId(attributeInfoQueryReq.getGroupId())
                 .updatedBy(attributeInfoQueryReq.getUpdatedBy())
                 .updatedTime(attributeInfoQueryReq.getUpdatedTime())
                 .build();
@@ -86,7 +82,6 @@ public class AttributeInfo extends BaseEntity {
     public static AttributeInfo saveBuild(AttributeInfoSaveReq attributeInfoSaveReq){
         return AttributeInfo.builder()
                 .name(attributeInfoSaveReq.getName())
-                .groupId(attributeInfoSaveReq.getGroupId())
                 .updatedBy(attributeInfoSaveReq.getUpdatedBy())
                 .updatedTime(attributeInfoSaveReq.getUpdatedTime())
                 .build();
@@ -99,7 +94,6 @@ public class AttributeInfo extends BaseEntity {
         return AttributeInfo.builder()
             .id(id)
                 .name(attributeInfoEditReq.getName())
-                .groupId(attributeInfoEditReq.getGroupId())
                 .updatedBy(attributeInfoEditReq.getUpdatedBy())
                 .updatedTime(attributeInfoEditReq.getUpdatedTime())
                 .build();
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java
index c9677d4..1350029 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/BrandInfo.java
@@ -30,7 +30,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
 @TableName("brand_info")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "BrandInfo", description = "品牌信息")
-public class BrandInfo extends BaseEntity {
+public class  BrandInfo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -59,21 +59,6 @@ public class BrandInfo extends BaseEntity {
     @ApiModelProperty(name = "是否启用", value = "是否启用")
     private String stauts;
 
-    /** 创建人 */
-    @ApiModelProperty(name = "创建人", value = "创建人", required = true)
-    private String createdBy;
-
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间", value = "创建时间", required = true)
-    private Date createdTime;
-
-    /** 更新人 */
-    @ApiModelProperty(name = "更新人", value = "更新人")
-    private String updatedBy;
-
-    /** 更新时间 */
-    @ApiModelProperty(name = "更新时间", value = "更新时间")
-    private Date updatedTime;
 
     /**
     * 查询构造器
@@ -96,8 +81,9 @@ public class BrandInfo extends BaseEntity {
                 .logo(brandInfoSaveReq.getLogo())
                 .introduction(brandInfoSaveReq.getIntroduction())
                 .stauts(brandInfoSaveReq.getStauts())
-                .updatedBy(brandInfoSaveReq.getUpdatedBy())
-                .updatedTime(brandInfoSaveReq.getUpdatedTime())
+                .updateBy(brandInfoSaveReq.getUpdatedBy())
+                .updateTime(brandInfoSaveReq.getUpdatedTime())
+                .remark(brandInfoSaveReq.getRemark())
                 .build();
     }
 
@@ -111,8 +97,11 @@ public class BrandInfo extends BaseEntity {
                 .logo(brandInfoEditReq.getLogo())
                 .introduction(brandInfoEditReq.getIntroduction())
                 .stauts(brandInfoEditReq.getStauts())
-                .updatedBy(brandInfoEditReq.getUpdatedBy())
-                .updatedTime(brandInfoEditReq.getUpdatedTime())
+                .createBy(brandInfoEditReq.getIntroduction())
+                .createTime(brandInfoEditReq.getCreateTime())
+                .updateBy(brandInfoEditReq.getUpdatedBy())
+                .updateTime(brandInfoEditReq.getUpdatedTime())
+                .remark(brandInfoEditReq.getRemark())
                 .build();
     }
 
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java
index d15b28b..d3d041f 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoQueryReq.java
@@ -29,9 +29,7 @@ public class AttributeInfoQueryReq extends BaseEntity {
     @ApiModelProperty(name = "属性名", value = "属性名")
     private String name;
 
-    /** 分组 */
-    @ApiModelProperty(name = "分组", value = "分组")
-    private Long groupId;
+
 
     /** 更新人 */
     @ApiModelProperty(name = "更新人", value = "更新人")
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java
index a897399..410b619 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeInfoSaveReq.java
@@ -35,10 +35,7 @@ public class AttributeInfoSaveReq extends BaseEntity {
     @ApiModelProperty(name = "属性名", value = "属性名", required = true)
     private String name;
 
-    /** 分组 */
 
-    @ApiModelProperty(name = "分组", value = "分组")
-    private Long groupId;
 
     /** 创建人 */
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java
new file mode 100644
index 0000000..12336bb
--- /dev/null
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java
@@ -0,0 +1,15 @@
+package com.muyu.product.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.product.domain.AsAttributeGroup;
+
+/**
+ * 属性与组中间Mapper接口
+ *
+ * @author XiaoHuang
+ * @date 2024-03-07
+ */
+public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup> {
+
+}
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java
new file mode 100644
index 0000000..cec4405
--- /dev/null
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java
@@ -0,0 +1,22 @@
+package com.muyu.product.service;
+
+import java.util.List;
+import com.muyu.product.domain.AsAttributeGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 属性与组中间Service接口
+ *
+ * @author XiaoHuang
+ * @date 2024-03-07
+ */
+public interface AsAttributeGroupService extends IService<AsAttributeGroup> {
+    /**
+     * 查询属性与组中间列表
+     *
+     * @param asAttributeGroup 属性与组中间
+     * @return 属性与组中间集合
+     */
+    public List<AsAttributeGroup> list(AsAttributeGroup asAttributeGroup);
+
+}
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java
new file mode 100644
index 0000000..7f255a0
--- /dev/null
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java
@@ -0,0 +1,49 @@
+package com.muyu.product.service.impl;
+
+import java.util.List;
+
+import com.muyu.common.core.utils.ObjUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.muyu.product.mapper.AsAttributeGroupMapper;
+import com.muyu.product.domain.AsAttributeGroup;
+import com.muyu.product.service.AsAttributeGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+/**
+ * 属性与组中间Service业务层处理
+ *
+ * @author XiaoHuang
+ * @date 2024-03-07
+ */
+@Slf4j
+@Service
+public class AsAttributeGroupServiceImpl extends ServiceImpl<AsAttributeGroupMapper, AsAttributeGroup>  implements AsAttributeGroupService {
+
+    /**
+     * 查询属性与组中间列表
+     *
+     * @param asAttributeGroup 属性与组中间
+     * @return 属性与组中间
+     */
+    @Override
+    public List<AsAttributeGroup> list(AsAttributeGroup asAttributeGroup) {
+        LambdaQueryWrapper<AsAttributeGroup> queryWrapper = new LambdaQueryWrapper<>();
+
+
+        if (ObjUtils.notNull(asAttributeGroup.getGroupId())){
+            queryWrapper.eq(AsAttributeGroup::getGroupId, asAttributeGroup.getGroupId());
+        }
+
+        if (ObjUtils.notNull(asAttributeGroup.getAttributeId())){
+            queryWrapper.eq(AsAttributeGroup::getAttributeId, asAttributeGroup.getAttributeId());
+        }
+
+
+
+
+
+        return list(queryWrapper);
+    }
+}
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java
index 1466a2f..799959d 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsCategoryAttributeServiceImpl.java
@@ -41,20 +41,20 @@ public class AsCategoryAttributeServiceImpl extends ServiceImpl<AsCategoryAttrib
         }
 
 
-        if (ObjUtils.notNull(asCategoryAttribute.getCreatedBy())){
-            queryWrapper.eq(AsCategoryAttribute::getCreatedBy, asCategoryAttribute.getCreatedBy());
+        if (ObjUtils.notNull(asCategoryAttribute.getCreateBy())){
+            queryWrapper.eq(AsCategoryAttribute::getCreateBy, asCategoryAttribute.getCreateBy());
         }
 
-        if (ObjUtils.notNull(asCategoryAttribute.getCreatedTime())){
-            queryWrapper.eq(AsCategoryAttribute::getCreatedTime, asCategoryAttribute.getCreatedTime());
+        if (ObjUtils.notNull(asCategoryAttribute.getCreateTime())){
+            queryWrapper.eq(AsCategoryAttribute::getCreateTime, asCategoryAttribute.getCreateTime());
         }
 
-        if (ObjUtils.notNull(asCategoryAttribute.getUpdatedBy())){
-            queryWrapper.eq(AsCategoryAttribute::getUpdatedBy, asCategoryAttribute.getUpdatedBy());
+        if (ObjUtils.notNull(asCategoryAttribute.getUpdateBy())){
+            queryWrapper.eq(AsCategoryAttribute::getUpdateBy, asCategoryAttribute.getUpdateBy());
         }
 
-        if (ObjUtils.notNull(asCategoryAttribute.getUpdatedTime())){
-            queryWrapper.eq(AsCategoryAttribute::getUpdatedTime, asCategoryAttribute.getUpdatedTime());
+        if (ObjUtils.notNull(asCategoryAttribute.getUpdateTime())){
+            queryWrapper.eq(AsCategoryAttribute::getUpdateTime, asCategoryAttribute.getUpdateTime());
         }
         return list(queryWrapper);
     }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java
index d0567bf..1c29aae 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/BrandInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.muyu.product.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.muyu.common.core.utils.ObjUtils;
+import com.muyu.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.muyu.product.mapper.BrandInfoMapper;
@@ -48,10 +50,20 @@ public class BrandInfoServiceImpl extends ServiceImpl<BrandInfoMapper, BrandInfo
             queryWrapper.eq(BrandInfo::getStauts, brandInfo.getStauts());
         }
 
-
-
-
-
         return list(queryWrapper);
     }
+
+    @Override
+    public boolean save(BrandInfo entity) {
+        entity.setCreateBy(SecurityUtils.getUsername());
+        entity.setCreateTime(new Date());
+        return super.save(entity);
+    }
+
+    @Override
+    public boolean updateById(BrandInfo entity) {
+        entity.setUpdateBy(SecurityUtils.getUsername());
+        entity.setUpdateTime(new Date());
+        return super.updateById(entity);
+    }
 }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml
new file mode 100644
index 0000000..05c468d
--- /dev/null
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muyu.product.mapper.AsAttributeGroupMapper">
+
+    <resultMap type="com.muyu.product.domain.AsAttributeGroup" id="AsAttributeGroupResult">
+        <result property="id"    column="id"    />
+        <result property="groupId"    column="group_id"    />
+        <result property="attributeId"    column="attribute_id"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectAsAttributeGroupVo">
+        select id, group_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_attribute_group
+    </sql>
+</mapper>