springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -31,8 +31,8 @@ @Override public R deleteMerchant(String merchantId, String operator) { int result = this.baseMapper.deleteMerchantById(merchantId, operator); public R deleteMerchant(String merchantId) { int result = this.baseMapper.deleteMerchantById(merchantId); if (result > 0) { return R.ok(); }