From 60a6332afdf38f4cf71c4979aab0fa2b817623ed Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 13:23:37 +0800
Subject: [PATCH] Pman.Dialog.AdminCompanyMerge.bjs
 Pman.Dialog.AdminCompanyMerge.js

---
 Pman.Dialog.AdminCompanyMerge.bjs | 2 +-
 Pman.Dialog.AdminCompanyMerge.js  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index 1ffaa3a..5c05b86 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -95,7 +95,7 @@
              "id" : "id",
              "root" : "data",
              "xtype" : "JsonReader",
-             "$ fields" : "[\n    {\n        \"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]",
+             "$ fields" : "[\n    {\n        \"name\":\"id\",\n        \"type\":\"int\"\n    },\n    {\n        \"name\":\"name\",\n        \"type\":\"string\"\n    }\n]",
              "$ xns" : "Roo.data",
              "* prop" : "reader",
              "totalProperty" : "total"
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index c6233c0..eda4557 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -187,7 +187,14 @@ Pman.Dialog.AdminCompanyMerge = {
             xtype : 'JsonReader',
             fields : [
                 {
-                    "name":"id","type":"int"},{"name":"name","type":"string"}],
+                    "name":"id",
+                    "type":"int"
+                },
+                {
+                    "name":"name",
+                    "type":"string"
+                }
+            ],
             id : 'id',
             root : 'data',
             totalProperty : 'total',
-- 
2.39.2