Merge remote-tracking branch 'origin/apps_dev' into apps_dev
This commit is contained in:
commit
c3d9d2b34e
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -569,7 +569,7 @@ public class ArisXmlImportRun {
|
|||||||
attrNumberObj.put("scope", attributeModel.getScope());
|
attrNumberObj.put("scope", attributeModel.getScope());
|
||||||
attrNumberObj.put("name", attributeModel.getTitle());
|
attrNumberObj.put("name", attributeModel.getTitle());
|
||||||
attrNumberObj.put("id", attributeModel.getKey());
|
attrNumberObj.put("id", attributeModel.getKey());
|
||||||
attrNumberObj.put("textarea", attributeModel.getType());
|
attrNumberObj.put("type", attributeModel.getType());
|
||||||
attrNumberObj.put("groupPath", attributeModel.getGroupPath());
|
attrNumberObj.put("groupPath", attributeModel.getGroupPath());
|
||||||
attrNumberObj.put("desc", attributeModel.getDesc());
|
attrNumberObj.put("desc", attributeModel.getDesc());
|
||||||
|
|
||||||
@ -600,7 +600,7 @@ public class ArisXmlImportRun {
|
|||||||
attrDescObj.put("scope", attributeModel.getScope());
|
attrDescObj.put("scope", attributeModel.getScope());
|
||||||
attrDescObj.put("name", attributeModel.getTitle());
|
attrDescObj.put("name", attributeModel.getTitle());
|
||||||
attrDescObj.put("id", attributeModel.getKey());
|
attrDescObj.put("id", attributeModel.getKey());
|
||||||
attrDescObj.put("textarea", attributeModel.getType());
|
attrDescObj.put("type", attributeModel.getType());
|
||||||
attrDescObj.put("groupPath", attributeModel.getGroupPath());
|
attrDescObj.put("groupPath", attributeModel.getGroupPath());
|
||||||
attrDescObj.put("desc", attributeModel.getDesc());
|
attrDescObj.put("desc", attributeModel.getDesc());
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user