From f5d3adf884a49cb8f4563be0c7086a506011d64d Mon Sep 17 00:00:00 2001 From: zhanglin8526 <852614290@qq.com> Date: 星期六, 26 八月 2023 14:35:47 +0800 Subject: [PATCH] 修改订单查询 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java index d18020a..1f0459f 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java @@ -3,20 +3,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.order.domain.dto.*; -import com.ruoyi.order.domain.vo.*; +import com.ruoyi.order.domain.dto.MerConsumerGoodsDto; +import com.ruoyi.order.domain.dto.MerConsumerGoodsPageDto; +import com.ruoyi.order.domain.dto.MerServiceRecordPageDto; +import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto; +import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo; +import com.ruoyi.order.domain.vo.MerConsumerGoodsVo; +import com.ruoyi.order.domain.vo.MerServiceRecordPageVo; import com.ruoyi.order.service.order.ConsumerGoodsService; import com.ruoyi.order.service.order.UserServiceRecordService; -import com.ruoyi.system.api.domain.poji.member.Member; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; /** -- Gitblit v1.7.1