Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-27 43c263df4d8ce0cc830f287780c29db8a2b47f0f

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/dto/GoodsBrandQuery.java

File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/DTO/GoodsBrandQuery.java
@@ -1,4 +1,4 @@
package com.ruoyi.goods.controller.management.DTO;
package com.ruoyi.goods.controller.management.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;