fix 解决冲突！

src/main/java/com/lanren/huhu/partner/model/Partner.java

-<<<<<<< HEAD
-package com.lanren.huhu.partner.model;
import com.lanren.huhu.partner.model.base.BaseModel;import lombok.Data;
import javax.validation.constraints.Digits;import javax.validation.constraints.Min;import javax.validation.constraints.NotEmpty;import javax.validation.constraints.NotNull;import java.io.Serializable;
/**
 * @author houseme
 * @date 2019-06-26 11:47
 * @Project partner
 * @Package com.lanren.huhu.partner.model
 * @File: Partner
 */@Datapublic class Partner extends BaseModel {
    @NotNull(message = "userId 不能为空")
    @Min(value = 1, message = "userId 需要大于0")
    private int userId;

    private int level;}
+package com.lanren.huhu.partner.model;
import com.lanren.huhu.partner.model.base.BaseModel;import lombok.Data;
import javax.validation.constraints.Min;import javax.validation.constraints.NotNull;
/**
 * @author houseme
 * @date 2019-06-26 11:47
 * @Project partner
 * @Package com.lanren.huhu.partner.model
 * @File: Partner
 */@Datapublic class Partner extends BaseModel {
    @NotNull(message = "userId 不能为空")
    @Min(value = 1, message = "userId 需要大于0")
    private int userId;

    private int level;}
\ No newline at end of file
-=======
-package com.lanren.huhu.partner.model;
import lombok.Data;
import javax.validation.constraints.Min;import javax.validation.constraints.NotNull;import java.io.Serializable;
/**
 * @author houseme
 * @date 2019-06-26 11:47
 * @Project partner
 * @Package com.lanren.huhu.partner.model
 * @File: Partner
 */@Datapublic class Partner implements Serializable {

    private static final long serialVersionUID = 1L;

    @NotNull(message = "userId 不能为空")
    @Min(value = 1, message = "userId 需要大于0")
    private int userId;

    private int level;}
->>>>>>> 478bfc0d38ef17c50b36f0ae58a32183187f6bbf