From 8267cbdb4dc96787e245a794f7ec6b4cadf7d532 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 16:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 01fde83..1784a33 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -1,10 +1,9 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
-import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
@@ -18,6 +17,8 @@
String selectNameById(Integer id);
Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user);
+
+ Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user);
int updateUser(User user);
@@ -34,4 +35,10 @@
int upUserPassword(String oldPassword, String newPassWord);
+ int addPersonUser(PersonDto personDto);
+
+ int upUserDepardLimsId(String ids, String id);
+
+ int delUserDepardLimsId(Integer id);
+
}
--
Gitblit v1.9.3