[fix]修改商户账单和订单核销

ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @Api(tags = "订单相关接口")
-@RequestMapping("/app/customer/order")
+@RequestMapping("/app/order")
 @RestController
 @RequiredArgsConstructor
 public class AppOrderController {

ruoyi-admin/src/main/java/org/dromara/app/merchant/AppMerchantBillController.java

@@ -1,4 +1,4 @@
-package org.dromara.app.shop;
+package org.dromara.app.merchant;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

ruoyi-admin/src/main/java/org/dromara/app/merchant/AppMerchantOrderController.java

@@ -1,6 +1,5 @@
-package org.dromara.app.shop;
+package org.dromara.app.merchant;
 
-import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
 import com.wzj.soopin.order.service.VerificationCodeService;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/app/merchant/order")
 @RestController
 @RequiredArgsConstructor
-public class AppShopOrderController {
+public class AppMerchantOrderController {
 
     private final VerificationCodeService verificationCodeService;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java

@@ -15,7 +15,7 @@ import java.util.Map;
 @Data
 public  class BaseBO <T> {
 
-    private Integer pageNo=1;
+    private Integer pageNum=1;
 
     private Integer pageSize=10;
 
@@ -33,6 +33,6 @@ public  class BaseBO <T> {
     }
 
     public Page<T> getPage() {
-        return new Page<>(pageNo, pageSize);
+        return new Page<>(pageNum, pageSize);
     }
 }