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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseDeptDict.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_dept_dict")
public class BaseDeptDict extends IntegerIdentityEntity {
public class BaseDeptDict extends UuidIdentityEntity {
    private String subject;
    private String subjectName;
    private String deptCode;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseSuperviseDataDict.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_supervise_data_dict")
public class BaseSuperviseDataDict extends IntegerIdentityEntity {
public class BaseSuperviseDataDict extends UuidIdentityEntity {
    private String dictName;//环境名字
    private String corporation;//单位法人姓名

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseSuperviseDict.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_supervise_dict")
public class BaseSuperviseDict extends IntegerIdentityEntity {
public class BaseSuperviseDict extends UuidIdentityEntity {
    private String userName ;
    private String psw ;
    private String appId ;