Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huach...

manailin

2022-09-24 9030449dcf90628b7d7b28911c7843c97f04c103

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