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/impl/NewFightConvenientMerchantServiceImpl.java

@@ -56,6 +56,7 @@

    @Override
    public R addData(NewFightConvenientMerchantVO item) {
        item.setIsDel("0");
        int num=baseMapper.addData(item);
        if(num>0)
        {
@@ -80,6 +81,11 @@
    }

    @Override
    public R selectUserListB(String communityId, String phoneOrname) {
        return R.ok(baseMapper.selectUserListB(communityId,phoneOrname));
    }

    @Override
    public R selectUserBind(String communityId, String userId) {
        return R.ok(baseMapper.selectUserBind(communityId,userId));
    }