puhanshu
2022-07-29 0693fe374a4c9c8844ef985ef29d856b3b5b7c64
bug修改
4个文件已修改
15 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidMember.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community.easyPhoto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -26,12 +28,14 @@
    private static final long serialVersionUID = 309168056104824588L;
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -6,6 +6,8 @@
import javax.validation.constraints.Pattern;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -36,6 +38,7 @@
    private String name;
    @ApiModelProperty("角色")
    @JsonSerialize(using = ToStringSerializer.class)
    @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
    private Long roleId;
@@ -57,6 +60,7 @@
    private Long communityId;
    @ApiModelProperty(value = "用户主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty(value = "当前页数")
@@ -94,12 +98,14 @@
    private String areaCode;
    @ApiModelProperty(value = "街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;
    @ApiModelProperty(value = "三社账户类型  1街道 2社会组织 3社会组织成员")
    private Integer socialType;
    @ApiModelProperty("社会组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;
    @ApiModelProperty("绑定单位")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java
@@ -12,7 +12,7 @@
public class StreetVO implements Serializable {
    @ApiModelProperty("街道id")
    private Integer id;
    private Long id;
    @ApiModelProperty("街道名")
    private String name;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidMember.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -33,6 +35,7 @@
    private static final long serialVersionUID = -88592294208705755L;
    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**