Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -2,8 +2,10 @@ package com.yihu.jw.entity.base.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
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.util.Date;
@@ -285,6 +287,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "idcard")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getIdcard() {
        return idcard;
    }
@@ -312,6 +315,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "name")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getName() {
        return name;
    }
@@ -340,6 +344,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "mobile")
    @Convert(converter = StringFStringEncryptConverter.class)
    public String getMobile() {
        return mobile;
    }