From 04f5c3bd20524c97dce07cc03bb24e190303083a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 14:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 91%
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 1ad8e92..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,13 +7,13 @@
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;
// 鍙ˉ璐�
@@ -23,12 +23,12 @@
// 宸茶ˉ璐存垚鍔�
public static final int STATE_SUBSIDIZED = 3;
- public OrderSubsidy(Long id) {
+ public InviteOrderSubsidy(Long id) {
super();
this.id = id;
}
- public OrderSubsidy() {
+ public InviteOrderSubsidy() {
}
@Column(name = "os_id")
--
Gitblit v1.8.0