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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java

@@ -25,16 +25,16 @@
    @ApiModelProperty("邻里圈回复内容")
    private String content;

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

    @ApiModelProperty(value = "用户手机号",hidden = true)
    @ApiModelProperty(value = "用户手机号", hidden = true)
    private String phone;

    /**
     * 回复类型（1.评论  2.回复）
     * 回复类型（1.评论 2.回复）
     */
    public interface type{
    public interface type {
        int pl = 1;
        int hf = 2;
    }