代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -8,10 +8,10 @@
@ApiModel("钱包详情返回参数")
public class ComActWalletDetailDTO {

    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;

    @ApiModelProperty(value = "社区id",hidden = true)
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

}