충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java

@@ -14,10 +14,11 @@
    private Long id;
    private Boolean useYn;
    private Long userId;
    private Boolean permPartnerSetting;
    private Boolean permWorkSpaceSetting;
    private Boolean permProjectSetting;
    private Boolean permIssueSetting;
    private Boolean permUser;
    private Boolean permApi;
    private Boolean permNotice;
    private Boolean permFAQ;
    private Boolean permQnA;
@@ -56,6 +57,14 @@
        this.userId = userId;
    }

    public Boolean getPermPartnerSetting() {
        return permPartnerSetting;
    }

    public void setPermPartnerSetting(Boolean permPartnerSetting) {
        this.permPartnerSetting = permPartnerSetting;
    }

    public Boolean getPermWorkSpaceSetting() {
        return permWorkSpaceSetting;
    }
@@ -80,12 +89,12 @@
        this.permIssueSetting = permIssueSetting;
    }

    public Boolean getPermUser() {
        return permUser;
    public Boolean getPermApi() {
        return permApi;
    }

    public void setPermUser(Boolean permUser) {
        this.permUser = permUser;
    public void setPermApi(Boolean permApi) {
        this.permApi = permApi;
    }

    public Boolean getPermNotice() {