Merge branch 'four_member' into test

101captain

2021-09-26 8be4769bf80c5e28152875a1428e39a9d369e18c

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

@@ -4,6 +4,8 @@
import java.util.List;

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.model.helper.encrypt.EncryptDecryptClass;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
@@ -24,6 +26,7 @@
public class ComElderAuthRecordVO {

    @ApiModelProperty(value = "自增id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "高龄老人id")