Merge branch 'master' of ssh://hsh-peterhormanns@dev.hostsharing.net:29418/hsadmin/hs.hsadmin.jee.git

This commit is contained in:
Peter Hormanns 2017-06-22 15:54:38 +02:00
commit 6abbbabb39

View File

@ -24,7 +24,7 @@ public class MemberAsset implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "member_share_id", columnDefinition = "integer")
@Column(name = "member_asset_id", columnDefinition = "integer")
private long id;
@JoinColumn(name = "bp_id", columnDefinition = "integer", nullable = false)
@ -36,7 +36,7 @@ public class MemberAsset implements Serializable {
private Date date;
@Column(name="action", nullable = false)
private MemberShareAction action;
private MemberAssetAction action;
@Column(name="amount", nullable = false)
private BigDecimal amount;
@ -76,16 +76,14 @@ public class MemberAsset implements Serializable {
this.date = date;
}
public MemberShareAction getAction() {
public MemberAssetAction getAction() {
return action;
}
public void setAction(MemberShareAction action) {
public void setAction(MemberAssetAction action) {
this.action = action;
}
public String getComment() {
return comment;
}