From 4de99ed19360471d9c9cc192d85f10185db4259f Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期六, 25 五月 2024 09:39:30 +0800 Subject: [PATCH] 解决冲突 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java index 88d4097..3968773 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IMemberInvoiceRiseService.java @@ -1,12 +1,10 @@ package com.ruoyi.order.service; -import com.ruoyi.common.core.utils.page.PageDTO; -import com.ruoyi.order.dto.MemberInvoiceRiseDTO; -import com.ruoyi.order.domain.pojo.MemberInvoiceRise; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.order.domain.pojo.Order; - -import java.util.List; +import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.order.domain.pojo.MemberInvoiceRise; +import com.ruoyi.order.dto.MemberInvoiceRiseDTO; +import com.ruoyi.system.api.domain.Order; /** * <p> -- Gitblit v1.7.1