Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -4,6 +4,7 @@
import com.zy.asrs.entity.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -18,4 +19,7 @@

    List<Order> selectorderNoL(@Param("orderNo")String orderNo);

    @Select("select * from man_order where settle > 5 and status = 1")
    List<Order> selectToBeHistoryOrder();

}