Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-31 b22a45c73c7d3dfdabcd7a0fd8a3b93263a0dfa9

 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;
}