Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java

@@ -7,13 +7,9 @@
import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
import org.springframework.transaction.annotation.Transactional;

import java.io.Serializable;

import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -80,4 +76,9 @@
     * @return
     */
    List<User> selectUser();

    /**
     * 获取所有用户的名称与Id
     */
    List<Map<String, Object>> getUserNameAndId();
}