Merge remote-tracking branch 'origin/master'

mitao

2024-03-06 51527a6e817a6ba73b29b07e94a7e879a86f8eaf

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppSearchGoodsPageDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.order.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;