Merge remote-tracking branch 'origin/master'

CeDo

2021-04-20 38541a4e5731da9f478b50875a1d4cb978b0cfd5

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

@@ -97,10 +97,10 @@

    @Override
    public R deleteStore(Long[] id) {
        ComShopStoreDO storeDO = new ComShopStoreDO();
        storeDO.setDeleteStatus(2);
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getId, id);
        int update = this.baseMapper.update(storeDO, query);
        LambdaQueryWrapper<ComShopStoreDO> query = new LambdaQueryWrapper<ComShopStoreDO>().in(ComShopStoreDO::getId, id);
        ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(query);
        comShopStoreDO.setDeleteStatus(2);
        int update = this.baseMapper.updateById(comShopStoreDO);
        return update > 0 ? R.ok() : R.fail();
    }