From 54678b74ca31199615349ce0d5e2b6e5c105fef7 Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Mon, 24 Mar 2025 18:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=9C=B0=E5=8C=BA=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98Long=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/charge/ChargeChannelAdminService.java         | 2 +-
 .../admin/service/charge/ChargeRegionAdminService.java          | 2 +-
 .../service/charge/impl/ChargeChannelAdminServiceImpl.java      | 2 +-
 .../admin/service/charge/impl/ChargeRegionAdminServiceImpl.java | 2 +-
 .../admin/controller/charge/ChargeChannelAdminController.java   | 2 +-
 .../src/main/java/com/accompany/payment/model/ChargeRegion.java | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeChannelAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeChannelAdminService.java
index f5ca0cd34..51e4c9c9c 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeChannelAdminService.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeChannelAdminService.java
@@ -20,7 +20,7 @@ public interface ChargeChannelAdminService {
      * @param regionType
      * @return
      */
-    Page<ChargeChannelAdminVo> page(Integer regionType);
+    Page<ChargeChannelAdminVo> page(Long regionType);
 
     /**
      * 保存
diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeRegionAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeRegionAdminService.java
index d6da37558..2c3fec957 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeRegionAdminService.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/ChargeRegionAdminService.java
@@ -25,7 +25,7 @@ public interface ChargeRegionAdminService {
      * @param regionType
      * @return
      */
-    Page<ChargeRegion> page(Integer regionType);
+    Page<ChargeRegion> page(Long regionType);
 
     /**
      * 保存
diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeChannelAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeChannelAdminServiceImpl.java
index 8007ae145..0d13be2ca 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeChannelAdminServiceImpl.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeChannelAdminServiceImpl.java
@@ -56,7 +56,7 @@ public class ChargeChannelAdminServiceImpl implements ChargeChannelAdminService
     private JedisService jedisService;
 
     @Override
-    public Page<ChargeChannelAdminVo> page(Integer regionType) {
+    public Page<ChargeChannelAdminVo> page(Long regionType) {
         List<ChargeRegion> chargeRegions = chargeRegionService.list(Wrappers.<ChargeRegion>lambdaQuery()
                 .eq(ChargeRegion::getType, regionType));
         if (CollectionUtil.isEmpty(chargeRegions)) {
diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java
index da7f6f0dc..8ba7b714d 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/impl/ChargeRegionAdminServiceImpl.java
@@ -41,7 +41,7 @@ public class ChargeRegionAdminServiceImpl implements ChargeRegionAdminService {
     }
 
     @Override
-    public Page<ChargeRegion> page(Integer regionType) {
+    public Page<ChargeRegion> page(Long regionType) {
         List<ChargeRegion> chargeRegions = chargeRegionService.list(Wrappers.<ChargeRegion>lambdaQuery()
                 .eq(ChargeRegion::getType, regionType)
                 .orderByAsc(ChargeRegion::getSeq));
diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeChannelAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeChannelAdminController.java
index 12a0fce86..b693b60af 100644
--- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeChannelAdminController.java
+++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeChannelAdminController.java
@@ -33,7 +33,7 @@ public class ChargeChannelAdminController {
      */
     @ApiOperation("分页")
     @GetMapping("page")
-    public PageResult<ChargeChannelAdminVo> page(@RequestParam("regionType") Integer regionType) {
+    public PageResult<ChargeChannelAdminVo> page(@RequestParam("regionType") Long regionType) {
         return new PageResult<>(chargeChannelAdminService.page(regionType));
     }
 
diff --git a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/model/ChargeRegion.java b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/model/ChargeRegion.java
index 01498fc0f..799bceac6 100644
--- a/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/model/ChargeRegion.java
+++ b/accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/model/ChargeRegion.java
@@ -44,7 +44,7 @@ public class ChargeRegion {
      */
     @ApiModelProperty("地区类型")
     @TableField("`type`")
-    private Integer type;
+    private Long type;
 
     /**
      * 排序