embeding field name with parent.

Author: zhangjunfeng

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryEntityClassProperty.java

@@ -72,7 +72,9 @@ public void alias(String alias) {
      * @return Alias.
      */
     public String alias() {
-        return F.isEmpty(alias) ? name : alias;
+    	// modify@byron
+    	return F.isEmpty(alias) ? fullName() : alias;
+        //-return F.isEmpty(alias) ? name : alias;
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/QueryEntityTypeDescriptor.java

@@ -169,7 +169,7 @@ public Class<?> keyClass() {
      * @param failOnDuplicate Fail on duplicate flag.
      */
     public void addProperty(QueryEntityClassProperty prop, QuerySqlField sqlAnn, boolean key, boolean failOnDuplicate) {
-        String propName = prop.name();
+        String propName = prop.fullName(); // modify@byron
 
         if (sqlAnn != null && !F.isEmpty(sqlAnn.name()))
             propName = sqlAnn.name();
@@ -180,10 +180,10 @@ public void addProperty(QueryEntityClassProperty prop, QuerySqlField sqlAnn, boo
                 "QueryEntity [key=" + keyCls.getName() + ", value=" + valCls.getName() + ']');
         }
 
-        fields.put(prop.fullName(), prop.type());
+        fields.put(propName, prop.type());
 
         if (key)
-            keyProps.add(prop.fullName());
+            keyProps.add(propName);
     }
 
     /**