Merge branch 'dev' of liubing/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/iot/dict/IotHospitalDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.dict;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -157,6 +159,7 @@ public class IotHospitalDO extends UuidIdentityEntity {
        this.photo = photo;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getPhone() {
        return phone;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/equipment/IotEquipmentDetailDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.equipment;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -156,6 +158,7 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
        this.address = address;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getRepresentative() {
        return representative;
    }
@@ -164,6 +167,7 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
        this.representative = representative;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getApplicantName() {
        return applicantName;
    }
@@ -172,6 +176,7 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
        this.applicantName = applicantName;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getApplicantTel() {
        return applicantTel;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/gateway/GcClientDetails.java

@@ -2,7 +2,10 @@ package com.yihu.jw.entity.iot.gateway;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.sql.Timestamp;
@@ -104,6 +107,7 @@ public class GcClientDetails extends IdEntity implements java.io.Serializable {
    }
    @Column(name = "create_user_name", length = 20)
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getCreateUserName() {
        return this.createUserName;
    }
@@ -131,6 +135,7 @@ public class GcClientDetails extends IdEntity implements java.io.Serializable {
    }
    @Column(name = "update_user_name", length = 100)
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUpdateUserName() {
        return this.updateUserName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/platform/IotInterfaceLogDO.java

@@ -1,12 +1,10 @@
package com.yihu.jw.entity.iot.platform;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import org.hibernate.boot.model.relational.Namespace;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -115,6 +113,7 @@ public class IotInterfaceLogDO extends UuidIdentityEntityWithOperator implements
        this.userId = userId;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getUserName() {
        return userName;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/iot/product/IotProductExtendInfoDO.java

@@ -1,8 +1,10 @@
package com.yihu.jw.entity.iot.product;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.util.StringFStringEncryptConverter;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
@@ -141,6 +143,7 @@ public class IotProductExtendInfoDO extends UuidIdentityEntityWithOperator imple
        this.ratifyDate = ratifyDate;
    }
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getAgencyName() {
        return agencyName;
    }