Merge remote-tracking branch 'origin/div' into div

admin

2020-05-16 94325dc13ea8b7c2d33ed63a78908915599c2fa3

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/TeamFansInfo.java

@@ -83,6 +83,9 @@
    private String tagsSup; // 间接上级标签



    @Field

    private Date crateTime; // 创建时间

	
    @Field

    private Date updateTime; // 更新时间



    public String getId() {

@@ -269,4 +272,12 @@
        this.updateTime = updateTime;

    }



    public Date getCrateTime() {

        return crateTime;

    }



    public void setCrateTime(Date crateTime) {

        this.crateTime = crateTime;

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java

@@ -80,7 +80,7 @@
            teamFansInfoDao.updateSelective(record);
        } else {
            initData(record);
            record.setUpdateTime(new Date());
            record.setCrateTime(new Date());
            teamFansInfoDao.save(record);
        }
    }