Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 43c263df4d8ce0cc830f287780c29db8a2b47f0f

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrandServiceImpl.java

@@ -5,9 +5,9 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.goods.controller.management.DTO.GoodsBrandDTO;
import com.ruoyi.goods.controller.management.DTO.GoodsBrandQuery;
import com.ruoyi.goods.controller.management.VO.GoodsBrandVO;
import com.ruoyi.goods.controller.management.dto.GoodsBrandDTO;
import com.ruoyi.goods.controller.management.dto.GoodsBrandQuery;
import com.ruoyi.goods.controller.management.vo.GoodsBrandVO;
import com.ruoyi.goods.domain.GoodsBrand;
import com.ruoyi.goods.mapper.GoodsBrandMapper;
import com.ruoyi.goods.service.IGoodsBrandService;