合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 java110-bean/src/main/java/com/java110/po/contract/ContractPo.java

@@ -26,6 +26,8 @@
    private String contractCode;
    private String objType;
    private String operatorLink;
    private String contractParentId;


    public String getaLink() {
        return aLink;
@@ -202,4 +204,14 @@
    public void setStateDesc(String stateDesc) {
        this.stateDesc = stateDesc;
    }

    public String getContractParentId() {
        return contractParentId;
    }

    public void setContractParentId(String contractParentId) {
        this.contractParentId = contractParentId;
    }


}