java/qijisheng.git

			@@ -3,10 +3,13 @@
			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 com.ruoyi.common.core.annotation.Excel;
			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;
			@@ -35,22 +38,36 @@
			@ApiModelProperty(value = "门店id")
			@TableField("shop_id")
			private Integer shopId;

			@ApiModelProperty(value = "变动类型（1=返佣，2=提现）")
			@ApiModelProperty(value = "门店名称")
			@TableField(exist = false)
			@Excel(name = "门店名称")
			private String shopName;
			@ApiModelProperty(value = "店长名称")
			@TableField(exist = false)
			@Excel(name = "店长姓名")
			private String shopManagerName;
			@ApiModelProperty(value = "联系电话")
			@TableField(exist = false)
			@Excel(name = "联系电话")
			private String phone;
			@ApiModelProperty(value = "变动类型（1=服务商分佣,2=高级服务商分佣,3=核销门店服务费,4=提现）")
			@TableField("type")
			@Excel(name = "变更类型",readConverterExp = "1=服务商分佣,2=高级服务商分佣,3=核销门店服务费")
			private Integer type;

			@ApiModelProperty(value = "历史余额")
			@TableField("historical_balance")
			private BigDecimal historicalBalance;

			@ApiModelProperty(value = "变动金额")
			@TableField("variable_amount")
			private BigDecimal variableAmount;

			@ApiModelProperty(value = "变动时间")
			@TableField("create_time")
			@Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime createTime;
			@ApiModelProperty(value = "变动金额")
			@TableField(exist = false)
			@Excel(name = "变更数量")
			private String variableAmountString;



			@ApiModelProperty(value = "变动用户id")
			@TableField("create_user_id")
			@@ -59,6 +76,30 @@
			@ApiModelProperty(value = "关联对象id")
			@TableField("object_id")
			private Long objectId;

			@ApiModelProperty(value = "变动方向（-1：减少，1：增加）")
			@TableField("change_direction")
			private Integer changeDirection;







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

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

			@ApiModelProperty(value = "扩展字段")
			@TableField("extension")
			private String extension;
			}