Merge remote-tracking branch 'origin/master'

liujie

2023-05-26 2e3407d0b46a6e2e75f8cf14cce73f8e0ba2051e

 src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java

@@ -16,7 +16,7 @@
 */
public interface ITUserService extends IService<TUser> {

    List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id);
    List<TUserVo> getList(Page<TUserVo> tUserVoPage, String name, Integer id,int companyId);


    TUserBasicInfo getBasicInfo(Integer tUserId);