Merge branch 'master' into develop/express

2023-10-25 09:05:37 +08:00
parent 719711c614 0658e0a325
commit 0ae9d88639
9 changed files with 39 additions and 38 deletions
--- a/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
+++ b/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
@@ -19,6 +19,6 @@ import java.util.List;
 public interface BuyOrderDao extends BaseMapper<BuyOrder> {
    List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);

-    Page<BuyOrder> testPage(Page<BuyOrder> page);
+//    Page<BuyOrder> testPage(Page<BuyOrder> page);

 }
--- a/src/main/java/com/peanut/modules/book/dao/MyUserDao.java
+++ b/src/main/java/com/peanut/modules/book/dao/MyUserDao.java
@@ -14,6 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface MyUserDao extends BaseMapper<MyUserEntity> {

-    void update(MyUserEntity user);
 	
 }