Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrandMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.goods.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.GoodsBrand;
import com.ruoyi.system.api.domain.GoodsBrand;

/**
 * <p>