Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

tangxiaobao

2022-04-24 dd9e637f8840fc9a7aee46acd7751994e0a05055

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

@@ -98,6 +98,8 @@
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        //注册手机不可修改
        entity.setRegPhone(null);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
@@ -118,6 +120,8 @@
        entity.setId(id);
        entity.setIsDel(ComBatteryStore.IsDel.YES);
        if (this.baseMapper.updateById(entity) > 0) {
            //同时删除账号
            this.baseMapper.deleteStoreUserByStoreId(id);
            return R.ok();
        }
        return R.fail("删除失败");