Merge remote-tracking branch 'origin/master'

This commit is contained in:
snoop 2017-06-23 13:55:38 +09:00
commit 4cb943774a

View File

@ -11,6 +11,14 @@ public class MetaMemberStatus {
private short id; private short id;
private String name; private String name;
public MetaMemberStatus() {
}
public MetaMemberStatus(short id) {
this.id = id;
}
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {