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

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

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index b8719c4..dfbf534 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -85,7 +85,7 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Core_enum'",
+             "$ url" : "baseURL + '/Roo/Core_company'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index eabcc26..8f8336b 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -179,7 +179,7 @@ Pman.Dialog.AdminCompanyMerge = {
            proxy : {
             xtype : 'HttpProxy',
             method : 'GET',
-            url : baseURL + '/Roo/Core_enum',
+            url : baseURL + '/Roo/Core_company',
             xns : Roo.data,
             '|xns' : 'Roo.data'
            },
-- 
2.39.2