Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java

@@ -3,8 +3,6 @@
import java.math.BigDecimal;



import javax.persistence.Column;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Transient;



import org.yeshi.utils.mybatis.Table;

@@ -108,8 +106,6 @@
   private String payPassword;



   @Column(name = "sid")

   @ManyToOne

   @JoinColumn(name = "sid")

   private BusinessSystem system;



   @Column(name = "rank")

@@ -151,7 +147,7 @@
   private String rankNamePicture;// 等级名称图片

   @Transient

   private String taoBaoUid;// 淘宝的用户ID



	
   public String getTaoBaoUid() {

      return taoBaoUid;

   }