Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-22 6f30b5c886cd05081d6250eb0506816fb2ac80ec

 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;

}