sujinwen
2017-07-25 4ca768a6e07bf7e776625bc148a0fc61d00b05b1
Failed commit: Default

git-svn-id: http://192.168.1.226/svn/proxy@899 454eff88-639b-444f-9e54-f578c98de674
10个文件已修改
209 ■■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -65,7 +64,27 @@
    private String isSynchron;
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 签到事件主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
@@ -46,6 +46,26 @@
    private String isSynchron;
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    
    /**
     * Get 公司主键
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -59,6 +58,25 @@
    private String isSynchron;
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 部门主键
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -174,6 +173,26 @@
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 设备主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -78,13 +77,34 @@
    private String remark;
    // 公司主键
    private String compnayId;
    // 同步时间
    //同步时间
    private String updateTime;
    // 是否同步
    private String isSynchron;
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -42,6 +41,26 @@
    // 是否同步
    private String isSynchron;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 人员主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -78,6 +77,26 @@
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -66,6 +65,26 @@
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 签到事件主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -48,6 +47,27 @@
    // 设备所在机构id
    private String deviceCompanyId;
    private String isValid;
    private String createTime;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    /**
     * Get 职位主键
     */
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
@@ -1,7 +1,6 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -220,6 +219,21 @@
    private String company;
    private String visitorOrAttender;
    private String isValid;
    public String getIsValid() {
        return isValid;
    }
    public void setIsValid(String isValid) {
        this.isValid = isValid;
    }
    /**
     * Get 人员主键
     */