Merge remote-tracking branch 'origin/master'

k94314517

2025-04-11 4d4394311a96e15ea204e2cae03dda00750d0fdd

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

@@ -124,10 +124,11 @@
    @Override
    public List<Managers> findList(Managers pageWrap) {
        MPJLambdaWrapper<Managers> queryWrapper = new MPJLambdaWrapper<>();
      pageWrap.setIsdeleted(Constants.ZERO);
        pageWrap.setIsdeleted(Constants.ZERO);
        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)