Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-22 da8edafa9803834b08061fd30ac79f8c249900b8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java

@@ -14,13 +14,14 @@
@Data
@ApiModel
public class ComActColumnVO {

    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    @JsonSerialize(using = ToStringSerializer.class)
    private String name;

    /**