Merge branch 'huacheng_dev' into huacheng_shuangzheng

101captain

2022-06-29 17da4898e0519e6ea42344801d84574f60699503

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