Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-11-10 bdbe40f077aa9ca2ec184707d3eab41af13def03

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