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

admin

2019-12-03 8d38972b593b5ba698b0e605039ed8c795eaaef5

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

@@ -11,7 +11,6 @@
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 {