Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java

@@ -173,7 +173,10 @@
            return R.fail("商家不存在");
        }
        mcsMerchant.setIsDel(true);
        this.baseMapper.updateById(mcsMerchant);
        int num = this.baseMapper.updateById(mcsMerchant);
        if (num > 0) {
            this.baseMapper.enableUserStatus(mcsMerchant.getUserId());
        }
        return R.ok();
    }