Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

zf

2023-08-30 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b

 src/main/java/com/gk/hotwork/Service/UserService.java

@@ -21,6 +21,9 @@

    void selectUserDataGrid(PageInfo pageInfo);

    void selectCompanyUserDataGrid(PageInfo pageInfo);
    void selectSuperviseUserDataGrid(PageInfo pageInfo);

    UserInfo selectByUser(String username);

    List<UserInfo> selectUserInfo(Long id, String username);
@@ -28,6 +31,8 @@
    boolean checkUserById(String userId);

    UserVo selectUserVoByName(String examtype, String username);

    UserVo selectUserVoById(Long userId);

    void deleteById(Long id);

@@ -108,4 +113,8 @@
     */
    UserInfo getByUserId(Long userId);


    void selectExpertUserDataGrid(PageInfo pageInfo);

    List<UserInfo> selectExpertList(String realname);
}