|
|
@@ -6,94 +6,94 @@ public class TOrderBonus {
|
|
|
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.id
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private String id;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.create_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private Date createTime;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.order_no
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private String orderNo;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.bonus_subject
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private Integer bonusSubject;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_status
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private Integer grantStatus;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_target
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private String grantTarget;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_by
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private String grantBy;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private Date grantTime;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_type
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
private Integer grantType;
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.id
|
|
|
* @return the value of t_order_bonus.id
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public String getId() {
|
|
|
return id;
|
|
|
@@ -102,11 +102,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.id
|
|
|
* @param id the value for t_order_bonus.id
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setId(String id) {
|
|
|
this.id = id;
|
|
|
@@ -115,11 +115,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.create_time
|
|
|
* @return the value of t_order_bonus.create_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public Date getCreateTime() {
|
|
|
return createTime;
|
|
|
@@ -128,11 +128,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.create_time
|
|
|
* @param createTime the value for t_order_bonus.create_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setCreateTime(Date createTime) {
|
|
|
this.createTime = createTime;
|
|
|
@@ -141,11 +141,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.order_no
|
|
|
* @return the value of t_order_bonus.order_no
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public String getOrderNo() {
|
|
|
return orderNo;
|
|
|
@@ -154,11 +154,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.order_no
|
|
|
* @param orderNo the value for t_order_bonus.order_no
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setOrderNo(String orderNo) {
|
|
|
this.orderNo = orderNo;
|
|
|
@@ -167,11 +167,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.bonus_subject
|
|
|
* @return the value of t_order_bonus.bonus_subject
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public Integer getBonusSubject() {
|
|
|
return bonusSubject;
|
|
|
@@ -180,11 +180,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.bonus_subject
|
|
|
* @param bonusSubject the value for t_order_bonus.bonus_subject
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setBonusSubject(Integer bonusSubject) {
|
|
|
this.bonusSubject = bonusSubject;
|
|
|
@@ -193,11 +193,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_status
|
|
|
* @return the value of t_order_bonus.grant_status
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public Integer getGrantStatus() {
|
|
|
return grantStatus;
|
|
|
@@ -206,11 +206,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_status
|
|
|
* @param grantStatus the value for t_order_bonus.grant_status
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setGrantStatus(Integer grantStatus) {
|
|
|
this.grantStatus = grantStatus;
|
|
|
@@ -219,11 +219,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_target
|
|
|
* @return the value of t_order_bonus.grant_target
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public String getGrantTarget() {
|
|
|
return grantTarget;
|
|
|
@@ -232,11 +232,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_target
|
|
|
* @param grantTarget the value for t_order_bonus.grant_target
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setGrantTarget(String grantTarget) {
|
|
|
this.grantTarget = grantTarget;
|
|
|
@@ -245,11 +245,7 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_by
|
|
|
* @return the value of t_order_bonus.grant_by
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public String getGrantBy() {
|
|
|
return grantBy;
|
|
|
@@ -258,11 +254,7 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_by
|
|
|
* @param grantBy the value for t_order_bonus.grant_by
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public void setGrantBy(String grantBy) {
|
|
|
this.grantBy = grantBy;
|
|
|
@@ -271,11 +263,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_time
|
|
|
* @return the value of t_order_bonus.grant_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public Date getGrantTime() {
|
|
|
return grantTime;
|
|
|
@@ -284,11 +276,11 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_time
|
|
|
* @param grantTime the value for t_order_bonus.grant_time
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
-=======
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setGrantTime(Date grantTime) {
|
|
|
this.grantTime = grantTime;
|
|
|
@@ -297,8 +289,6 @@ public class TOrderBonus {
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_type
|
|
|
* @return the value of t_order_bonus.grant_type
|
|
|
-<<<<<<< HEAD
|
|
|
- * @mbggenerated Tue Nov 27 10:35:55 CST 2018
|
|
|
*/
|
|
|
public Integer getGrantType() {
|
|
|
return grantType;
|
|
|
@@ -309,7 +299,7 @@ public class TOrderBonus {
|
|
|
* This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_type
|
|
|
* @param grantType the value for t_order_bonus.grant_type
|
|
|
* @mbg.generated Tue Nov 27 11:15:28 CST 2018
|
|
|
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
+
|
|
|
*/
|
|
|
public void setGrantType(Integer grantType) {
|
|
|
this.grantType = grantType;
|