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

Conflicts:
	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

common/common-entity/src/main/java/com/yihu/jw/entity/door/DoctorRegistration.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -12,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_doctor_registration")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_doctor_registration")
public class DoctorRegistration extends IdEntity {
    //登记服务一级模板编码
    private String code;

common/common-entity/src/main/java/com/yihu/jw/entity/door/DoctorRegistrationTemp.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.door;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -12,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_doctor_registration_temp")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_doctor_registration_temp")
public class DoctorRegistrationTemp extends IdEntity {
    //二级模板标识
    private String code;

common/common-entity/src/main/java/com/yihu/jw/entity/door/SignFamily.java

@@ -3,10 +3,7 @@ package com.yihu.jw.entity.door;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
/**
@@ -16,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_sign_family")
public class SignFamily extends IdEntity {
    private static final long serialVersionUID = 364799142991631092L;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorCommentDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
*/
@Entity
@Table(name = "wlyy_door_comment")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_comment")
public class WlyyDoorCommentDO extends IntegerIdentityEntityWithOperator {
    /**

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorCommentDoctorDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
*/
@Entity
@Table(name = "wlyy_door_comment_doctor")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_comment_doctor")
public class WlyyDoorCommentDoctorDO extends IntegerIdentityEntityWithOperator {
    /**

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorOrderItemDO.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.door;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -13,6 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_door_order_item")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_order_item")
public class WlyyDoorOrderItemDO extends IdEntity {
    private String doctor;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorPrescriptionDO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
@@ -18,6 +19,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_door_prescription")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_prescription")
public class WlyyDoorPrescriptionDO extends IntegerIdentityEntity {
    private String code ;//业务标识

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorPrescriptionDetailDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_door_prescription_detail")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_prescription_detail")
public class WlyyDoorPrescriptionDetailDO extends IntegerIdentityEntity {
    private String code;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorPrescriptionDrugDO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_door_prescription_drug")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_prescription_drug")
public class WlyyDoorPrescriptionDrugDO extends IntegerIdentityEntity {
    private String code;                    //业务主键
    private String prescriptionCode;      //处方code 关联表wlyy_door_prescription code

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorProcessLogDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -17,6 +18,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_door_process_log")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_process_log")
public class WlyyDoorProcessLogDO extends UuidIdentityEntity {
    /**

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorServiceApplicationDo.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.BaseIdentityEntity;
import org.springframework.data.annotation.LastModifiedBy;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
@@ -16,6 +17,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_door_service_application")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_service_application")
public class WlyyDoorServiceApplicationDo extends BaseIdentityEntity {
    /**居民code*/
    private String patient;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorServiceConfigureDo.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.door;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
@@ -11,6 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_door_service_configure")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_service_configure")
public class WlyyDoorServiceConfigureDo extends BaseIdentityEntity {
    /**内容类型：1上门服务资质限制*/
    private String contentType;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorServiceVoucherDo.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.door;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
@@ -12,6 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_door_service_voucher")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_door_service_voucher")
public class WlyyDoorServiceVoucherDo extends BaseIdentityEntity {
    /**上门服务申请审核id*/
    private Long serviceId;

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyFeldsherCADO.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.door;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@@ -12,6 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_feldsher_ca")
@SequenceGenerator(name="id_generated", sequenceName="wlyy_feldsher_ca")
public class WlyyFeldsherCADO extends IdEntity {
    private String recipeNo;//医嘱号
    private String patient;//居民code