Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/dict/SystemDict.java

@@ -1,10 +1,7 @@
package com.yihu.wlyy.entity.dict;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
@@ -21,7 +18,7 @@ public class SystemDict  implements java.io.Serializable {
	private String value;
	private String pyCode;
	private Integer sort;
	private String id;
	private Integer id;
	// Constructors
@@ -36,15 +33,14 @@ public class SystemDict  implements java.io.Serializable {
		this.value = value;
	}
	// Property accessors
	@GenericGenerator(name = "generator", strategy = "uuid")
	@Id
	@GeneratedValue(generator = "generator")
	@Column(name = "id", unique = true, nullable = false, length = 50)
	public String getId() {
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return id;
	}
	public void setId(String id) {
	public void setId(Integer id) {
		this.id = id;
	}

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/dict/SystemDictList.java

@@ -1,10 +1,7 @@
package com.yihu.wlyy.entity.dict;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
@@ -25,7 +22,7 @@ public class SystemDictList   implements java.io.Serializable {
	private String relationColCode;
	private String relationColValue;
	private String relationColExtend;
	private String id;
	private Integer id;
	// Constructors
	/** default constructor */
@@ -56,15 +53,14 @@ public class SystemDictList   implements java.io.Serializable {
	}
	// Property accessors
	@GenericGenerator(name = "generator", strategy = "uuid")
	@Id
	@GeneratedValue(generator = "generator")
	@Column(name = "id", unique = true, nullable = false, length = 50)
	public String getId() {
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return id;
	}
	public void setId(String id) {
	public void setId(Integer id) {
		this.id = id;
	}