Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 小时以前 145dbc2a4f5bafcb432fb35d7bc91101aa3318d8

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java

@@ -2,9 +2,9 @@

import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
import io.swagger.annotations.Api;
@@ -71,7 +71,7 @@
    @PostMapping("/batchLoss")
    @RequiresPermissions("business:membercard:update")
    public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser());
        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -79,7 +79,7 @@
    @PostMapping("/batchUnLoss")
    @RequiresPermissions("business:membercard:update")
    public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser());
        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(null));
        return ApiResponse.success(null);
    }