Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java

@@ -2,11 +2,7 @@

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -64,4 +60,8 @@

    R selectUserList(String communityId,String phoneOrname);

    R selectUserListB(String communityId,String phoneOrname);


    R selectUserBind(String communityId, String userId);
}