Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-17 8722d2bb39c6c0697647e77a879d14b28d3ef0f5

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java

@@ -36,9 +36,13 @@
    @Excel(name = "手机号")
    private String phone;

    /** 地址 */
    @Excel(name = "地址")
    private String address;
    /** 身份证号 */
    @Excel(name = "身份证号")
    private String idCard;

    /** 人员分组 */
    @Excel(name = "人员分组")
    private String personGroup;

    /** 职责 */
    @Excel(name = "职责")
@@ -100,20 +104,28 @@
        this.phone = phone;
    }

    public String getPhone() 
    public String getPhone()
    {
        return phone;
    }
    public void setAddress(String address) 
    {
        this.address = address;

    public String getIdCard() {
        return idCard;
    }

    public String getAddress() 
    {
        return address;
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    public void setResponsibility(String responsibility) 

    public String getPersonGroup() {
        return personGroup;
    }

    public void setPersonGroup(String personGroup) {
        this.personGroup = personGroup;
    }

    public void setResponsibility(String responsibility)
    {
        this.responsibility = responsibility;
    }
@@ -150,7 +162,6 @@
            .append("name", getName())
            .append("type", getType())
            .append("phone", getPhone())
            .append("address", getAddress())
            .append("responsibility", getResponsibility())
            .append("status", getStatus())
            .append("isDeleted", getIsDeleted())