limin 7 yıl önce
ebeveyn
işleme
727d121c13

+ 0 - 4
src/main/java/com/goafanti/common/dao/TOrderBonusMapper.java

@@ -109,10 +109,6 @@ public interface TOrderBonusMapper {
 >>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	int updateByPrimaryKey(TOrderBonus record);
-<<<<<<< HEAD
-
-=======
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	List<TOrderBonusBo> getDeptBySome(TOrderBonusBo bonusBo);
 	List<TOrderBonusBo> getBonusData(TOrderBonusBo bonusBo);
 	

+ 0 - 10
src/main/java/com/goafanti/common/model/TOrderBonus.java

@@ -304,16 +304,6 @@ public class TOrderBonus {
 		return grantType;
 	}
 
-	/**
-	 * 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
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
-	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
-	 */
-	public Integer getGrantType() {
-		return grantType;
-	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_type

+ 1 - 59
src/main/java/com/goafanti/common/model/TOrderBonusExample.java

@@ -830,65 +830,7 @@ public class TOrderBonusExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andGrantTypeIsNull() {
-			addCriterion("grant_type is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeIsNotNull() {
-			addCriterion("grant_type is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeEqualTo(Integer value) {
-			addCriterion("grant_type =", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeNotEqualTo(Integer value) {
-			addCriterion("grant_type <>", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeGreaterThan(Integer value) {
-			addCriterion("grant_type >", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeGreaterThanOrEqualTo(Integer value) {
-			addCriterion("grant_type >=", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeLessThan(Integer value) {
-			addCriterion("grant_type <", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeLessThanOrEqualTo(Integer value) {
-			addCriterion("grant_type <=", value, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeIn(List<Integer> values) {
-			addCriterion("grant_type in", values, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeNotIn(List<Integer> values) {
-			addCriterion("grant_type not in", values, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeBetween(Integer value1, Integer value2) {
-			addCriterion("grant_type between", value1, value2, "grantType");
-			return (Criteria) this;
-		}
-
-		public Criteria andGrantTypeNotBetween(Integer value1, Integer value2) {
-			addCriterion("grant_type not between", value1, value2, "grantType");
-			return (Criteria) this;
-		}
+		
 	}
 
 	/**

+ 0 - 3
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -31,9 +31,6 @@ import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.techproject.enums.TaskState;
 import com.goafanti.order.enums.BonusSubject;
-import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.ProjectNewStage;
-import com.goafanti.order.enums.TaskState;
 
 public class ExportExcelUtil {