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

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

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