Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 b9fe4f29593fa980684b37085d3a440bb872356c

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java

@@ -124,7 +124,7 @@
        columnEntity.setIsNav(adminAddColumnDto.getIsNav());
        columnEntity.setContentType(adminAddColumnDto.getContentType());
        this.baseMapper.insert(columnEntity);
        return Result.ok("添加成功");
        return Result.ok("添加成功", columnEntity.getId());
    }

    @Override