Merge branch 'dev' of http://129.211.31.58:3000/JavaProject/mall-cloud into dev
# Conflicts: # mall-services/mall-product/src/main/java/com/mall/product/domain/vo/AttrGroupVo.java # mall-services/mall-product/src/main/java/com/mall/product/service/impl/AttrGroupServiceImpl.java
This commit is contained in:
commit
509a1a95f7
|
@ -10,7 +10,6 @@ import com.mall.product.domain.vo.AttrGroupVo;
|
|||
import com.mall.product.mapper.AttrGroupMapper;
|
||||
import com.mall.product.service.AttrGroupService;
|
||||
import com.mall.product.service.CategoryService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
@ -27,11 +26,14 @@ import java.util.List;
|
|||
*/
|
||||
@Service
|
||||
@Transactional
|
||||
@RequiredArgsConstructor
|
||||
public class AttrGroupServiceImpl extends ServiceImpl<AttrGroupMapper, AttrGroupEntity> implements AttrGroupService {
|
||||
|
||||
private final CategoryService categoryService;
|
||||
|
||||
public AttrGroupServiceImpl(CategoryService categoryService) {
|
||||
this.categoryService = categoryService;
|
||||
}
|
||||
|
||||
/**
|
||||
* * 属性分组 服务实现类
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue