From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
index 251ac98..3833f8e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
@@ -14,23 +14,21 @@
* @author Administrator
*
*/
-@Table("yeshi_red_pack_detail")
+@Table("yeshi_ec_red_pack_detail")
public class RedPackDetail {
public enum RedPackDetailTypeEnum {
+ refund("绾㈠寘閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ violation("绾㈠寘娑夊珜杩濊", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
newUserReward("鏂颁汉濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
invite("绔嬪緱鐜伴噾", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
increaseReward("閫掑濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
seriesReward("杩炵画濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- refund("绾㈠寘閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- videoRecharge("瑙嗛浼氬憳鍏呭��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- musicRecharge("闊充箰浼氬憳鍏呭��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- violation("绾㈠寘娑夊珜杩濊", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
-
giveOthers("绾㈠寘璧犻�佸緟棰嗗彇涓�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersSucceed("绾㈠寘璧犻�侀鍙栨垚鍔�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersFail("绾㈠寘璧犻�佽秴鏃堕��鍥�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersReceive("濂藉弸璧犻��", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
-
+ useByShopOrder("鍟嗗煄璁㈠崟浣跨敤", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ shopOrderDrawBack("鍟嗗煄璁㈠崟閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
redExchange("绾㈠寘鎻愮幇涓�", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
redExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png");
@@ -46,7 +44,7 @@
public String getDesc() {
return desc;
}
-
+
public String getPicture() {
return picture;
}
@@ -71,8 +69,8 @@
@Column(name = "rpd_type")
private RedPackDetailTypeEnum type;
@Expose
- @Column(name = "rpd_desc")
- private String desc;
+ @Column(name = "rpd_desc_info")
+ private String descInfo;
@Expose
@Column(name = "rpd_remark")
private String remark;
@@ -123,12 +121,12 @@
this.type = type;
}
- public String getDesc() {
- return desc;
+ public String getDescInfo() {
+ return descInfo;
}
- public void setDesc(String desc) {
- this.desc = desc;
+ public void setDescInfo(String descInfo) {
+ this.descInfo = descInfo;
}
public String getRemark() {
--
Gitblit v1.8.0