Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/member/controller/MemberController.java

@@ -122,5 +122,15 @@
      return R.status(memberService.removeByIds(Func.toLongList(ids)));
   }

   /**
    * 主要管理员信息
    * @param creditcode
    * @return
    */
   @PostMapping("/selectMemberInfo")
   public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
      IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
      return R.data(pages);
   }

}