From 820f5e29839322d2e123380970b81a17f27d85a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 三月 2019 17:32:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/xinge/PushRecord.java | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/xinge/PushRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/xinge/PushRecord.java
index 64014b2..2d51ca8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/xinge/PushRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/xinge/PushRecord.java
@@ -1,58 +1,48 @@
package com.yeshi.fanli.entity.xinge;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
-@Entity
-@Table(name = "yeshi_ec_push_record")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_push_record")
+@Table("yeshi_ec_push_record")
public class PushRecord {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "id")
+
+ @Column(name = "id")
private Long id;
- @Column(name = "`url`")
- @org.yeshi.utils.mybatis.Column(name = "url")
+ @Column(name = "url")
private String url;
- @Column(name = "`type`")
- @org.yeshi.utils.mybatis.Column(name = "type")
+ @Column(name = "type")
private Integer type; // 1.鍟嗗搧鎺ㄩ�� 2.url鎺ㄩ�� 3.鎺ㄨ崘璇︽儏椤甸潰鎺ㄩ�� 4.绔欏唴淇�
- @Column(name = "`title`")
- @org.yeshi.utils.mybatis.Column(name = "title")
+ @Column(name = "title")
private String title;
- @Column(name = "`state`")
- @org.yeshi.utils.mybatis.Column(name = "state")
+ @Column(name = "state")
private Integer state;// 1:閮芥垚鍔� 2锛氫粎android鎴愬姛 3.浠匢OS鎴愬姛 4.閮藉け璐�
- @org.yeshi.utils.mybatis.Column(name = "createtime")
+ @Column(name = "createtime")
private Long createtime;
- @org.yeshi.utils.mybatis.Column(name = "count")
+ @Column(name = "count")
private Long count;
- @org.yeshi.utils.mybatis.Column(name = "iosPushId")
+ @Column(name = "iosPushId")
private String iosPushId;
- @org.yeshi.utils.mybatis.Column(name = "androidPushId")
+ @Column(name = "androidPushId")
private String androidPushId;
- @org.yeshi.utils.mybatis.Column(name = "account")
+ @Column(name = "account")
private Integer account; // 鎺ユ敹瀵硅薄 0:锟�?锟斤拷璁惧 1锛欼OS璁惧 2锛欰ndroid璁惧 3.鍗曚釜璐﹀彿 4.鍏朵粬
- @org.yeshi.utils.mybatis.Column(name = "appName")
+ @Column(name = "state")
private String appName;
- @org.yeshi.utils.mybatis.Column(name = "uid")
- @Column(name = "`uid`")
+ @Column(name = "uid")
private Long uid;
+
+
public Long getId() {
return id;
--
Gitblit v1.8.0