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

yujian

2020-06-29 c2e3dea0d75b7239b1ed66c9d9e1bbb177050858

 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 {