Merge remote-tracking branch 'origin/master'

k94314517

2025-04-08 f37f50c13d1cfb858e34b39f6d3588d5ddb263ae

 server/src/main/java/com/doumee/service/business/impl/ManagersServiceImpl.java

@@ -128,6 +128,7 @@
        queryWrapper.selectAll(Managers.class )
                .selectAs(Member::getPhone,Managers::getMemberPhone)
                .selectAs(Member::getName,Managers::getMemberName)
                .selectAs(Member::getEmail,Managers::getMemberEmail)
                .selectAs(Member::getCompanyName,Managers::getCompanyName)
                .selectAs(SystemUser::getUsername,Managers::getEditorName)
                .leftJoin(Member.class,Member::getId,Managers::getMemberId)
@@ -165,6 +166,7 @@
        queryWrapper.selectAll(Managers.class )
                .selectAs(Member::getPhone,Managers::getMemberPhone)
                .selectAs(Member::getName,Managers::getMemberName)
                .selectAs(Member::getEmail,Managers::getMemberEmail)
                .selectAs(Member::getCompanyName,Managers::getCompanyName)
                .selectAs(SystemUser::getUsername,Managers::getEditorName)
                .leftJoin(Member.class,Member::getId,Managers::getMemberId)