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

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberCardService.java

@@ -1,7 +1,8 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.MemberCard;

import java.util.List;
@@ -54,7 +55,7 @@
     *
     * @param memberCards 实体集
     */
    void updateByIdInBatch(List<MemberCard> memberCards,Integer type);
    void updateByIdInBatch(List<MemberCard> memberCards, Integer type, LoginUserInfo userInfo);