Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

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

@@ -19,13 +19,13 @@
    @ApiModelProperty("邻里圈点赞业务id")
    private Long serviceId;

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

    /**
     * 邻里圈点赞类型（1.邻里圈 2.评论 3.回复）
     */
    public interface type{
    public interface type {
        int llq = 1;
        int pl = 2;
        int hf = 3;