Merge branch 'master' of ssh://hsh-peterhormanns@dev.hostsharing.net:29418/hsadmin/hs.hsadmin.jee.git
This commit is contained in:
commit
6abbbabb39
@ -24,7 +24,7 @@ public class MemberAsset implements Serializable {
|
|||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
@Column(name = "member_share_id", columnDefinition = "integer")
|
@Column(name = "member_asset_id", columnDefinition = "integer")
|
||||||
private long id;
|
private long id;
|
||||||
|
|
||||||
@JoinColumn(name = "bp_id", columnDefinition = "integer", nullable = false)
|
@JoinColumn(name = "bp_id", columnDefinition = "integer", nullable = false)
|
||||||
@ -36,7 +36,7 @@ public class MemberAsset implements Serializable {
|
|||||||
private Date date;
|
private Date date;
|
||||||
|
|
||||||
@Column(name="action", nullable = false)
|
@Column(name="action", nullable = false)
|
||||||
private MemberShareAction action;
|
private MemberAssetAction action;
|
||||||
|
|
||||||
@Column(name="amount", nullable = false)
|
@Column(name="amount", nullable = false)
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
@ -76,16 +76,14 @@ public class MemberAsset implements Serializable {
|
|||||||
this.date = date;
|
this.date = date;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MemberShareAction getAction() {
|
public MemberAssetAction getAction() {
|
||||||
return action;
|
return action;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAction(MemberShareAction action) {
|
public void setAction(MemberAssetAction action) {
|
||||||
this.action = action;
|
this.action = action;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public String getComment() {
|
public String getComment() {
|
||||||
return comment;
|
return comment;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user