代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java

@@ -21,7 +21,7 @@
import lombok.Data;

/**
 * @title: AddConvenientMerchantDTO
 * @title: ConvenientMerchantDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增/编辑便民服务商家
 * @author: hans
@@ -121,4 +121,12 @@
    public void setPeriod(MerchantBusinessPeriod period) {
        this.period = period;
    }

    public Boolean getBusinessStatus() {
        return businessStatus.intValue() == 1;
    }

    public void setBusinessStatus(Boolean businessStatus) {
        this.businessStatus = businessStatus ? 1 : 0;
    }
}