Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

tqs

2022-09-15 e282fbfabb7ddf460d7232f2aa4d3f8bbdd115f2

 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);
}