二维码生成地址修改，保安证编码生成修改

Administrator

2021-08-31 08363052cecb30230a2c8b3eba791ca8d1be00a5

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

@@ -24,14 +24,20 @@
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.excel.memberExcel;
import org.springblade.modules.member.excel.memberImporter;
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
import org.springblade.modules.shareholder.excel.shareExcel;
import org.springblade.modules.shareholder.excel.shareImporter;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.Valid;

@@ -131,9 +137,23 @@
    * @return
    */
   @PostMapping("/selectMemberInfo")
   public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
      IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
   public R<IPage<MemberVO>> selectMemberInfo(Member member,Query query) {
      IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), member);
      return R.data(pages);
   }



   /**
    * 导入管理人信息
    */
   @PostMapping("import-member")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入投资人", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      memberImporter memberImporter = new memberImporter(memberService, false);
      ExcelUtil.save(file, memberImporter, memberExcel.class);
      return R.success("操作成功");
   }

}