From c8fba69fa3c55036e45c177a744674dd1b0df927 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 22:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/service/IUserService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/service/IUserService.java b/src/main/java/com/nq/service/IUserService.java
index 56a7930..4bf0543 100644
--- a/src/main/java/com/nq/service/IUserService.java
+++ b/src/main/java/com/nq/service/IUserService.java
@@ -5,6 +5,8 @@
import com.nq.pojo.User;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
import javax.servlet.http.HttpServletRequest;
public interface IUserService {
@@ -62,7 +64,7 @@
ServerResponse addSimulatedAccount(Integer paramInteger1, String paramString1, String paramString2, String paramString3, Integer paramInteger2, HttpServletRequest paramHttpServletRequest);
- ServerResponse listByAdmin(String paramString1, String paramString2, Integer paramInteger1, Integer paramInteger2, int paramInt1, int paramInt2, HttpServletRequest paramHttpServletRequest);
+ ServerResponse listByAdmin(String paramString1, String paramString2, Integer paramInteger1, Integer paramInteger2, int paramInt1, int paramInt2, Integer isLock, Integer isLogin, String regTime,Integer isActive, HttpServletRequest paramHttpServletRequest) throws ParseException;
ServerResponse findByUserId(Integer paramInteger);
@@ -87,5 +89,7 @@
void updateUserAmt(Double amt, Integer user_id);
//
-// ServerResponse queryMyOption(String code, HttpServletRequest request);
+ ServerResponse queryMyOption(String code, HttpServletRequest request);
+
+ ServerResponse getMoenyLog(String type,HttpServletRequest request);
}
--
Gitblit v1.9.3