处理合并代码问题

Null

2021-03-17 8b13ca9086a609ef3bae76dab15faba55123d2dd

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java

@@ -135,5 +135,8 @@
    @ApiModelProperty(value = "社区后台登录用户",hidden = true)
    private Long backUserId;

    @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
    private Integer isPageMyWish;

}