Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 eb4cfe7327323367a08ac449ce838f95b2e96783

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