|
|
@@ -8,39 +8,39 @@ import java.util.Iterator;
|
|
|
public class TOrderBonusExample {
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
protected String orderByClause;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
protected boolean distinct;
|
|
|
/**
|
|
|
* This field was generated by MyBatis Generator. This field corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
protected List<Criteria> oredCriteria;
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public TOrderBonusExample() {
|
|
|
oredCriteria = new ArrayList<Criteria>();
|
|
|
@@ -48,11 +48,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public void setOrderByClause(String orderByClause) {
|
|
|
this.orderByClause = orderByClause;
|
|
|
@@ -60,11 +60,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public String getOrderByClause() {
|
|
|
return orderByClause;
|
|
|
@@ -72,11 +72,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public void setDistinct(boolean distinct) {
|
|
|
this.distinct = distinct;
|
|
|
@@ -84,11 +84,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public boolean isDistinct() {
|
|
|
return distinct;
|
|
|
@@ -96,11 +96,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public List<Criteria> getOredCriteria() {
|
|
|
return oredCriteria;
|
|
|
@@ -108,11 +108,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public void or(Criteria criteria) {
|
|
|
oredCriteria.add(criteria);
|
|
|
@@ -120,11 +120,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public Criteria or() {
|
|
|
Criteria criteria = createCriteriaInternal();
|
|
|
@@ -134,11 +134,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public Criteria createCriteria() {
|
|
|
Criteria criteria = createCriteriaInternal();
|
|
|
@@ -150,11 +150,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
protected Criteria createCriteriaInternal() {
|
|
|
Criteria criteria = new Criteria();
|
|
|
@@ -163,11 +163,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public void clear() {
|
|
|
oredCriteria.clear();
|
|
|
@@ -177,11 +177,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
protected abstract static class GeneratedCriteria {
|
|
|
protected List<Criterion> criteria;
|
|
|
@@ -835,11 +835,11 @@ public class TOrderBonusExample {
|
|
|
|
|
|
/**
|
|
|
* This class was generated by MyBatis Generator. This class corresponds to the database table t_order_bonus
|
|
|
-<<<<<<< HEAD
|
|
|
+<<<<<<< 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
|
|
|
+>>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
|
|
|
*/
|
|
|
public static class Criterion {
|
|
|
private String condition;
|
|
|
@@ -932,4 +932,4 @@ public class TOrderBonusExample {
|
|
|
super();
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|