Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 868c42a04909c8842c3bc7858cb64b5f368b8f99

 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();
    }