From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 01 九月 2023 08:50:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs --- src/main/java/com/zy/asrs/mapper/OrderMapper.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java index 2e52b23..3e1084b 100644 --- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java +++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java @@ -1,8 +1,7 @@ package com.zy.asrs.mapper; -import com.zy.asrs.entity.Order; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.Order; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -15,4 +14,7 @@ int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId); + List<Order> selectComplete(); + + int addToLogTable(Order order); } -- Gitblit v1.9.1