Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-08 81b386362237a6c85006b73824a95cdedb591131

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientServiceCategoryDTO.java

@@ -45,4 +45,6 @@

    @ApiModelProperty(value = "更新人", hidden = true)
    private Long updatedBy;

    private String areaCode;
}