java/qijisheng.git

			@@ -4,10 +4,12 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import lombok.EqualsAndHashCode;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.io.Serializable;
			import java.math.BigDecimal;
			@@ -31,7 +33,7 @@
			@ApiModelProperty("订单id")
			private Long orderId;

			@ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物")
			@ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物6订单取消回退")
			private Integer changeType;

			@ApiModelProperty("变更前金额")
			@@ -61,4 +63,16 @@
			@ApiModelProperty("消费金额")
			private BigDecimal amount;

			@ApiModelProperty(value = "开始时间")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime startTime;

			@ApiModelProperty(value = "结束时间")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime endTime;

			}