java/YueKeDuo.git

			@@ -977,7 +977,7 @@
			@ApiImplicitParams({
			@ApiImplicitParam(value = "类型(1充值，2消费)", name = "type", required = false, dataType = "Integer"),
			@ApiImplicitParam(value = "开始时间", name = "startDate", required = false, dataType = "String"),
			@ApiImplicitParam(value = "j结束时间", name = "endDate", required = false, dataType = "String"),
			@ApiImplicitParam(value = "结束时间", name = "endDate", required = false, dataType = "String"),
			})
			public ResultUtil balanceRecord(HttpServletRequest request, Integer type, String startDate, String endDate){
			try {

			@@ -1,5 +1,6 @@
			package com.stylefeng.guns.modular.system.model.vo;

			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.math.BigDecimal;
			@@ -19,26 +20,31 @@
			/**
			* 用户id
			*/
			@ApiModelProperty(value = "用户id")
			private Integer userId;

			/**
			* 1=增加，2=减少
			*/
			@ApiModelProperty(value = "类型，1加，2减")
			private Integer type;

			/**
			* 类型描述
			*/
			@ApiModelProperty(value = "类型描述：充值、消费")
			private String typeDesc;

			/**
			* 支付时间
			*/
			@ApiModelProperty(value = "支付时间")
			private Date payTime;

			/**
			* 金额
			*/
			@ApiModelProperty(value = "金额")
			private BigDecimal money;

			public static BalanceRecordVo convert(BalanceModifyRecordVo modifyRecordVo) {

	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/BalanceRecordVo.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史