Merge remote-tracking branch 'origin/bfasrs' into bfasrs

TQS

2023-02-08 6b3b7d9c3434f3ae8cb12ef8431b16c185f14628

 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,6 @@

    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    List<Order> selectComplete();

}