Merge remote-tracking branch 'origin/master'

This commit is contained in:
geek 2016-11-18 11:31:36 +09:00
commit 8d9efcade6
2 changed files with 3 additions and 5 deletions

View File

@ -17,7 +17,7 @@ public class DiscoveryPort {
private long id;
@ManyToOne
@JoinColumn
@JoinColumn(nullable = false)
@JsonIgnore
private DiscoveryHost host;
public DiscoveryHost getHost() {

View File

@ -21,8 +21,8 @@ public class ServiceScanHistory {
@Temporal(TemporalType.TIMESTAMP)
private Date createDate;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn
@ManyToOne
@JoinColumn(nullable = false)
@JsonIgnore
private DiscoveryPort port;
@ -34,8 +34,6 @@ public class ServiceScanHistory {
@Enumerated(EnumType.STRING)
private DirectionType direction;
@Lob
@Column(nullable = false)
private byte[] packet;