Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendSpecial.java

@@ -2,54 +2,42 @@


import java.io.Serializable;



import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.BusinessSystem;



@Entity

@Table(name = "yeshi_ec_super_recommendspecial")

@Table("yeshi_ec_super_recommendspecial")

public class SuperRecommendSpecial implements Serializable{

   /**

    * 

    */

   private static final long serialVersionUID = 1L;

   

   @Id

   @GeneratedValue(strategy = GenerationType.AUTO)

   @Column(name = "id")

   private long id;

   @ManyToOne(fetch = FetchType.EAGER)

   @JoinColumn(name = "recommendspecial_id")

   private Long id;

	
   @Column(name = "recommendspecial_id")

   private RecommendSpecial recommendSpecial;

   @ManyToOne(fetch = FetchType.EAGER)

   @JoinColumn(name = "system_id")

   private System system;

	
   @Column(name = "system_id")

   private BusinessSystem system;



   public SuperRecommendSpecial() {

      // TODO Auto-generated constructor stub

   }

   

   public SuperRecommendSpecial(RecommendSpecial recommendSpecial,

         System system) {

   public SuperRecommendSpecial(RecommendSpecial recommendSpecial, BusinessSystem system) {

      super();

      this.recommendSpecial = recommendSpecial;

      this.system = system;

   }



   public long getId() {

   public Long getId() {

      return id;

   }



   public void setId(long id) {

   public void setId(Long id) {

      this.id = id;

   }



@@ -61,11 +49,11 @@
      this.recommendSpecial = recommendSpecial;

   }



   public System getSystem() {

   public BusinessSystem getSystem() {

      return system;

   }



   public void setSystem(System system) {

   public void setSystem(BusinessSystem system) {

      this.system = system;

   }

}