Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 fe5224b371593245312f32495bf7752c837ed633

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

@@ -29,4 +29,6 @@

    @ApiModelProperty(value = "操作人", hidden = true)
    private Long userId;

    private String areaCode;
}