From d56944a1e0776da3f270353a902d5954e3373cee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 09:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
index 458bffc..b431ff5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java
@@ -2,11 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.Product;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -19,7 +17,7 @@
List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
- boolean reviewOrderById(String id,Integer status);
+ boolean reviewOrderById(String id, Integer status, String userId, String userName);
boolean reviewProcessById(String id, Integer status);
--
Gitblit v1.8.0