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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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

@@ -8,8 +8,9 @@
import javax.persistence.Table;

import javax.persistence.Transient;



import com.google.gson.annotations.Expose;



//假用户

@Entity

@Table(name = "yeshi_ec_sham_user")

@org.yeshi.utils.mybatis.Table("yeshi_ec_sham_user")

public class ShamUser {

@@ -18,18 +19,23 @@
   @Column(name = "`id`")

   private long id;



   @Expose

   @Column(name = "`name`")

   private String name;



   @Expose

   @Column(name = "`picUrl`")

   private String picUrl;



   @Expose

   @Transient

   private String msg;



   @Expose

   @Transient

   private String showId;



   @Expose

   @Transient

   private String shareBonusPic;