Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 4daaeb419439404a33c92f7ef1b6ee965981a41b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java

@@ -30,7 +30,7 @@

    private static final long serialVersionUID = 935049089365383863L;

    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
@@ -84,4 +84,8 @@

    private Long communityId;

    private Long parentId;

    private Long streetId;

}