Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-17 19b801af62236e7401ca6607b9c65181306e01b4

 flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java

@@ -53,6 +53,7 @@
     * 父节点id
     */
    @ApiModelProperty("父节点id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;

}