From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
index 6d8518c..abf91c7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -1,12 +1,8 @@
package com.yeshi.fanli.entity.bus.user;
-import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -24,7 +20,7 @@
public class ThreeSale {
public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
- public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
+ public static int EXPIRE_OUTOFDATE = 1;// 閭�璇峰叧绯昏劚绂�
public static int STATE_SUCCESS = 1;// 鎴愬姛
public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
--
Gitblit v1.8.0