Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 49f8452f2df3a630cf62e0c03909fe6862c4fc98

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