~jiangyouyao/beauty-erp.git

			@@ -1,5 +1,6 @@
			package com.matrix.system.hive.bean;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.matrix.core.anotations.Extend;
			import com.matrix.core.tools.DateUtil;
			@@ -15,18 +16,29 @@
			*/
			public class MoneyCardUse {

			private static final long serialVersionUID = 1L;


			private Long id;


			private String createBy;

			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date createTime;

			private String updateBy;

			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date updateTime;

			/**
			* 剩余次数
			*/
			@TableField(exist = false)
			String lastCountName;
			/**
			* 数据来源
			*/
			@TableField(exist = false)
			String sourceName;

			/vo对象***********/
			@@ -98,6 +110,7 @@
			/**
			* 订单ID
			*/
			@TableField(exist = false)
			private Long orderId;


			@@ -117,6 +130,7 @@
			/**
			* 前台输入的退款金额
			*/
			@TableField(exist = false)
			private String returnMonery;

			/**
			@@ -172,6 +186,38 @@
			return lastCountName;
			}

			public String getCreateBy() {
			return createBy;
			}

			public void setCreateBy(String createBy) {
			this.createBy = createBy;
			}

			public Date getCreateTime() {
			return createTime;
			}

			public void setCreateTime(Date createTime) {
			this.createTime = createTime;
			}

			public String getUpdateBy() {
			return updateBy;
			}

			public void setUpdateBy(String updateBy) {
			this.updateBy = updateBy;
			}

			public Date getUpdateTime() {
			return updateTime;
			}

			public void setUpdateTime(Date updateTime) {
			this.updateTime = updateTime;
			}

			public void setLastCountName(String lastCountName) {
			this.lastCountName = lastCountName;
			}
			@@ -212,12 +258,14 @@
			/**
			* 会员信息
			*/
			@TableField(exist = false)
			private SysVipInfo vipInfo;

			/**
			* 调整说明
			*/
			@Extend
			@TableField(exist = false)
			private String changeRemark;