diff --git a/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java b/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
index a9f10a9c..85dc9d3c 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java
@@ -27,7 +27,7 @@ public class MerchantRegisterController {
 
     /**
      * 激活码列表
-     *
+     * 权限标识: merchantRegister:list
      * @param pageDTO   分页参数
      * @param state     状态 0未激活 1已激活
      * @param startTime 开始时间
@@ -37,7 +37,7 @@ public class MerchantRegisterController {
     @SaAdminCheckRole("管理员")
     @SaAdminCheckPermission("merchantRegister:add")
     @GetMapping
-    public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime) {
+    public CzgResult<Page<MerchantRegister>> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
         return CzgResult.success(merchantRegisterService.get(pageDTO, state, startTime, endTime));
     }
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/MerchantRegisterService.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/MerchantRegisterService.java
index 511580cd..a4294744 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/MerchantRegisterService.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/MerchantRegisterService.java
@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 public interface MerchantRegisterService extends IService<MerchantRegister> {
 
-    Page<MerchantRegister> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime);
+    Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime);
 
     Boolean add(MerchantRegisterDTO merchantRegisterDTO);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java
index abd9fa4c..e0f548d0 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java
@@ -1,6 +1,8 @@
 package com.czg.service.account.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.czg.service.account.dto.PageDTO;
 import com.czg.service.account.dto.register.MerchantRegisterDTO;
 import com.czg.service.account.entity.SysRole;
@@ -27,19 +29,19 @@ import static com.mybatisflex.core.query.QueryMethods.column;
 public class MerchantRegisterServiceImpl extends ServiceImpl<MerchantRegisterMapper, MerchantRegister>  implements MerchantRegisterService{
 
     @Override
-    public Page<MerchantRegister> get(PageDTO pageDTO, Integer state, LocalDateTime startTime, LocalDateTime endTime) {
+    public Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
         QueryWrapper queryWrapper = new QueryWrapper();
 
         if (state != null) {
             queryWrapper.eq(MerchantRegister::getStatus, state);
         }
 
-        if (startTime != null) {
-            queryWrapper.ge(SysRole::getCreateTime, startTime);
+        if (StrUtil.isNotBlank(startTime)) {
+            queryWrapper.ge(MerchantRegister::getCreateTime, DateUtil.parse(startTime).toLocalDateTime());
         }
 
-        if (endTime != null) {
-            queryWrapper.le(SysRole::getCreateTime, endTime);
+        if (StrUtil.isNotBlank(endTime)) {
+            queryWrapper.le(MerchantRegister::getCreateTime, DateUtil.parse(endTime).toLocalDateTime());
         }
 
         return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);