Merge branch 'master_position' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -79,6 +79,11 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
 
+	//免费天数价值
+	@Column(name = "days_price")
+	@ApiModelProperty(value = "免费天数价值")
+	private BigDecimal daysPrice;
+
 	@Column(name = "big_icon")
 	@ApiModelProperty(value = "大图标")
 	private String bigIcon;