From 84d6908d149ba8b0f8a4ea335e71bcc0778d17f0 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 14:39:55 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/home/entity/MemberQuickBuySaleEntity.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/entity/MemberQuickBuySaleEntity.java b/src/main/java/com/xcong/excoin/modules/home/entity/MemberQuickBuySaleEntity.java
index 1c2e801..88ca2bc 100644
--- a/src/main/java/com/xcong/excoin/modules/home/entity/MemberQuickBuySaleEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/home/entity/MemberQuickBuySaleEntity.java
@@ -15,27 +15,27 @@
/**
* 订单状态 1-新建
*/
- public final int CHARGE_STATUS_CREATE = 1;
+ public static final Integer CHARGE_STATUS_CREATE = 1;
/**
* 订单状态 2-已付款
*/
- public final int CHARGE_STATUS_PAID = 2;
+ public static final Integer CHARGE_STATUS_PAID = 2;
/**
* 订单状态 3-已审核
*/
- public final int CHARGE_STATUS_CHECKED = 3;
+ public static final Integer CHARGE_STATUS_CHECKED = 3;
/**
* 订单状态 4-撤单
*/
- public final int CHARGE_STATUS_CANCEL_USER = 4;
+ public static final Integer CHARGE_STATUS_CANCEL_USER = 4;
/**
* 订单状态 5-系统取消
*/
- public final int CHARGE_STATUS_CANCEL_SYSTEM = 5;
+ public static final Integer CHARGE_STATUS_CANCEL_SYSTEM = 5;
private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@
/**
* 付款方式 1-支付宝2-微信3-银行卡
*/
- private int paymentType;
+ private Integer paymentType;
/**
* 收款账号
*/
--
Gitblit v1.9.1