From b9fa1c266e2d51388a757cf361680d82f6edfbea Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 15:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
index 704a6cf..fc5fc75 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java
@@ -2,13 +2,13 @@
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.erp.controller.dto.UserDTO;
 import com.example.erp.entity.userInfo.User;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 
@@ -38,4 +38,10 @@
     Boolean updateUserNameById(Integer id,String userName);
 
     Boolean updateProcessMp(Integer id, String process);
+
+    List<User> findByAddress(String userName);
+
+    String selectOptimizeParmsById(@Param("username") String username);
+
+    List<Map<String, Object>> getUserLog();
 }

--
Gitblit v1.8.0