From 68defbe491894e01c4402922de33c39633fca091 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Mar 2022 14:25:54 +0800
Subject: [PATCH] 系统名称

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
index 80a097b..0ae2601 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
@@ -1,5 +1,7 @@
 package com.matrix.system.hive.bean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 /**
@@ -8,9 +10,14 @@
  */
 public class MoneyCardUseFlow implements Serializable{
 
+	//jyytodo 改成枚举
     public static final String USE_TYPE_CONSUMER = "消费扣款";
 
     public static final String USE_TYPE_ORDRE_CANCEL = "取消订单";
+
+    public static final String USE_TYPE_ORDRE_TK = "订单退款";
+
+    public static final String USE_TYPE_GM = "购买充值卡";
 
     public static final String USE_TYPE_CZ = "会员充值";
 
@@ -48,6 +55,7 @@
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	private Date  createTime;
 	
 	/**

--
Gitblit v1.9.1