Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche

101captain

2022-08-15 bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1

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