Merge branch 'hotfix-0702-wangdy' into dev

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -24,7 +24,7 @@ import java.io.Serializable;
 @Entity
 @Table(name = "sec$users")
 @Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.User")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2c.model.User")
 public class User implements Serializable {
 
 	/**
@@ -124,7 +124,7 @@ public class User implements Serializable {
 	@ManyToMany(cascade = { CascadeType.REFRESH, CascadeType.REMOVE }, fetch = FetchType.EAGER)
 	@JoinTable(name = "sec$userenterprise", joinColumns = @JoinColumn(name = "user_uu", referencedColumnName = "user_uu"), inverseJoinColumns = @JoinColumn(name = "en_uu", referencedColumnName = "en_uu"))
 	@OrderBy("uu")
-	//@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 	private Set<Enterprise> enterprises;
 
 	/**