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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseHospitalParameterDO.java

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDeptHomepageBannerDO.java

@@ -3,11 +3,13 @@ package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_dept_homepage_banner")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DEPT_HOMEPAGE_BANNER_SEQ")
public class BaseDeptHomepageBannerDO  extends IntegerIdentityEntity {
    private String deptCode;//科室code
    private String deptName;//科室名称

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDiseaseHomepageBannerDO.java

@@ -3,11 +3,13 @@ package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_disease_homepage_banner")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DISEASE_HOMEPAGE_BANNER_SEQ")
public class BaseDiseaseHomepageBannerDO  extends IntegerIdentityEntity {
    private String diseaseCode;//
    private String diseaseName;//

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDoctorSortDO.java

@@ -3,11 +3,13 @@ package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_doctor_sort")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DOCTOR_SORT_SEQ")
public class BaseDoctorSortDO extends IntegerIdentityEntity {
    private String doctorCode;//医生code
    private String doctorName;//医生名称