From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index c425196..19b8c7a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -20,7 +20,7 @@
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
- "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"),orderReward("濂栧姳璁㈠崟");
+ "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈");
private final String desc;
private MsgTypeMoneyTypeEnum(String desc) {
@@ -44,6 +44,8 @@
private Integer goodsCount;// 鍟嗗搧鏁�
@Column(name = "mm_order_id")
private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
+ @Column(name = "mm_order_type")
+ private Integer orderType;
@Column(name = "mm_source_id")
private Extract extract;// 鎻愮幇璇︽儏
private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
@@ -182,4 +184,12 @@
this.alipayAccountValid = alipayAccountValid;
}
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
}
--
Gitblit v1.8.0