From 03ff607bab4b4220d37bdcb53ac542001ee0e264 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期三, 23 十月 2019 23:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderSubsidy.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
similarity index 89%
rename from fanli/src/main/java/com/yeshi/fanli/entity/order/OrderSubsidy.java
rename to fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
index bbfb0cf..5b1ca7e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/OrderSubsidy.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
@@ -7,14 +7,14 @@
import org.yeshi.utils.mybatis.Table;
/**
- * 璁㈠崟琛ヨ创
+ * 閭�璇疯鍗曡ˉ璐�
*
* @author Administrator
*
*/
-@Table("yeshi_ec_order_subsidy")
-public class OrderSubsidy {
- //鏈煡
+@Table("yeshi_ec_invite_order_subsidy")
+public class InviteOrderSubsidy {
+ // 鏈煡
public static final int STATE_UNKNOWN = 0;
// 鍙ˉ璐�
public static final int STATE_VALID = 1;
@@ -22,8 +22,15 @@
public static final int STATE_INVALID = 2;
// 宸茶ˉ璐存垚鍔�
public static final int STATE_SUBSIDIZED = 3;
-
-
+
+ public InviteOrderSubsidy(Long id) {
+ super();
+ this.id = id;
+ }
+
+ public InviteOrderSubsidy() {
+ }
+
@Column(name = "os_id")
private Long id;
@Column(name = "os_uid")
--
Gitblit v1.8.0