Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminColumnVo.java

@@ -26,6 +26,9 @@
    @ApiModelProperty(value = "图片")
    private String pic;

    @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
    private Integer contentType;

    @ApiModelProperty(value = "子菜单")
    private List<AdminColumnVo> child;
}