From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 19 一月 2019 17:39:06 +0800 Subject: [PATCH] Merge branch 'dev-msg' --- fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java index ea257f0..b0bdbf2 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java @@ -3,6 +3,9 @@ import java.math.BigDecimal; import java.util.Date; +import org.yeshi.utils.mybatis.Column; +import org.yeshi.utils.mybatis.Table; + import com.yeshi.fanli.entity.bus.user.UserInfo; /*** @@ -11,6 +14,7 @@ * @author Administrator * */ +@Table("yeshi_ec_msg_order") public class MsgOrderDetail { public final static int STATE_FK = 1;// 宸蹭粯娆� public final static int STATE_JS = 2;// 宸叉敹璐� @@ -30,17 +34,29 @@ } } + @Column(name = "mo_id") private Long id; + @Column(name = "mo_uid") private UserInfo user; + @Column(name = "mo_type") private MsgTypeOrderTypeEnum type;// 娑堟伅绫诲瀷 + @Column(name = "mo_order_id") private String orderId;// 璁㈠崟鍙� + @Column(name = "mo_state") private Integer state;// 鐘舵�� + @Column(name = "mo_goods_count") private Integer goodsCount;// 鍟嗗搧鏁伴噺 + @Column(name = "mo_pay_money") private BigDecimal payMoney;// 浠樻閲戦 + @Column(name = "mo_hongbao_money") private BigDecimal hongBaoMoney;// 浣i噾 + @Column(name = "mo_beizhu") private String beiZhu; + @Column(name = "mo_read") private Boolean read;// 鏄惁宸茶 + @Column(name = "mo_create_time") private Date createTime; + @Column(name = "mo_update_time") private Date updateTime; public Long getId() { -- Gitblit v1.8.0